Merge remote-tracking branch 'origin/master'

master
郑明梁 2 years ago
commit e31feebcd2

@ -7,12 +7,14 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@SpringBootApplication @SpringBootApplication
@ServletComponentScan @ServletComponentScan
@EnableScheduling @EnableScheduling
@MapperScan("com.glxp.api.dao") @MapperScan("com.glxp.api.dao")
@EnableTransactionManagement
public class ApiAdminApplication extends SpringBootServletInitializer { public class ApiAdminApplication extends SpringBootServletInitializer {

@ -1,6 +1,8 @@
package com.glxp.api.controller.auth; package com.glxp.api.controller.auth;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.auth.AuthCheckEntity; import com.glxp.api.entity.auth.AuthCheckEntity;
import com.glxp.api.req.auth.FilterAuthCheckRequest; import com.glxp.api.req.auth.FilterAuthCheckRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
@ -43,6 +45,7 @@ public class AuthCheckController {
} }
@PostMapping("/udiwms/auth/device/save") @PostMapping("/udiwms/auth/device/save")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse save(@RequestBody @Valid AuthCheckEntity authCheckEntity, public BaseResponse save(@RequestBody @Valid AuthCheckEntity authCheckEntity,
BindingResult bindingResult) { BindingResult bindingResult) {

@ -38,6 +38,7 @@ public class AuthUserController extends BaseController {
@AuthRuleAnnotation("admin/auth/admin/updateInv") @AuthRuleAnnotation("admin/auth/admin/updateInv")
@PostMapping("/admin/auth/admin/updateInv") @PostMapping("/admin/auth/admin/updateInv")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse updateInv(@RequestBody @Valid AuthUserSaveRequest authUserSaveRequest, public BaseResponse updateInv(@RequestBody @Valid AuthUserSaveRequest authUserSaveRequest,
BindingResult bindingResult) { BindingResult bindingResult) {

@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.DeptEntity;
@ -168,6 +170,7 @@ public class DeptController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/inv/warehouse/save") @PostMapping("/spms/inv/warehouse/save")
@Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse save(@RequestBody @Valid DeptEntity deptEntity, public BaseResponse save(@RequestBody @Valid DeptEntity deptEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -228,6 +231,7 @@ public class DeptController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/inv/warehouse/edit") @PostMapping("/spms/inv/warehouse/edit")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse edit(@RequestBody @Valid DeptEntity deptEntity, public BaseResponse edit(@RequestBody @Valid DeptEntity deptEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -258,6 +262,7 @@ public class DeptController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/inv/warehouse/delete") @PostMapping("/spms/inv/warehouse/delete")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
if (deleteRequest.getId() == null) { if (deleteRequest.getId() == null) {

@ -2,6 +2,8 @@ package com.glxp.api.controller.auth;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.DeptEntity;
import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.entity.auth.DeptUserEntity;
import com.glxp.api.req.auth.FilterDeptUserReqeust; import com.glxp.api.req.auth.FilterDeptUserReqeust;
@ -52,6 +54,7 @@ public class DeptUserController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("udi/auth/dept/user/delete") @PostMapping("udi/auth/dept/user/delete")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody DeptUserEntity deptUserEntity) { public BaseResponse delete(@RequestBody DeptUserEntity deptUserEntity) {
boolean b = deptUserService.delete(deptUserEntity.getDeptId(), deptUserEntity.getUserId()); boolean b = deptUserService.delete(deptUserEntity.getDeptId(), deptUserEntity.getUserId());
if (b) if (b)

@ -3,9 +3,11 @@ package com.glxp.api.controller.auth;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.DeptEntity;
import com.glxp.api.entity.auth.InvBusUserEntity; import com.glxp.api.entity.auth.InvBusUserEntity;
import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.auth.InvWarehouseEntity;
@ -106,6 +108,7 @@ public class InvBusUserController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/bus/user/warehouse/update") @PostMapping("/spms/bus/user/warehouse/update")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse updateRes(@RequestBody UpdateUserRelBusRequset relBusRequset) { public BaseResponse updateRes(@RequestBody UpdateUserRelBusRequset relBusRequset) {
boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
if (CollUtil.isNotEmpty(relBusRequset.getInvBusUserEntities())) { if (CollUtil.isNotEmpty(relBusRequset.getInvBusUserEntities())) {
@ -126,6 +129,7 @@ public class InvBusUserController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/bus/user/warehouse/post") @PostMapping("/spms/bus/user/warehouse/post")
@Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) { public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) {
boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) { if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) {
@ -155,6 +159,7 @@ public class InvBusUserController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/bus/user/warehouse/save") @PostMapping("/spms/bus/user/warehouse/save")
@Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse save(@RequestBody @Valid InvBusUserEntity invBusUserEntity, public BaseResponse save(@RequestBody @Valid InvBusUserEntity invBusUserEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -173,6 +178,7 @@ public class InvBusUserController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/bus/user/warehouse/edit") @PostMapping("/spms/bus/user/warehouse/edit")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse edit(@RequestBody @Valid InvBusUserEntity invBusUserEntity, public BaseResponse edit(@RequestBody @Valid InvBusUserEntity invBusUserEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -192,6 +198,7 @@ public class InvBusUserController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/bus/user/warehouse/delete") @PostMapping("/spms/bus/user/warehouse/delete")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
if (deleteRequest.getId() == null) { if (deleteRequest.getId() == null) {

@ -2,9 +2,11 @@ package com.glxp.api.controller.auth;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.auth.InvSpace; import com.glxp.api.entity.auth.InvSpace;
import com.glxp.api.req.auth.FilterInvSpaceRequest; import com.glxp.api.req.auth.FilterInvSpaceRequest;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
@ -48,6 +50,7 @@ public class InvSpaceController {
* @return * @return
*/ */
@PostMapping("/spms/inv/space/add") @PostMapping("/spms/inv/space/add")
@Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse addSpace(@RequestBody InvSpace invSpace, BindingResult bindingResult) { public BaseResponse addSpace(@RequestBody InvSpace invSpace, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -65,6 +68,7 @@ public class InvSpaceController {
* @return * @return
*/ */
@PostMapping("/spms/inv/space/delete") @PostMapping("/spms/inv/space/delete")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse deleteSpace(@RequestBody DeleteRequest deleteRequest) { public BaseResponse deleteSpace(@RequestBody DeleteRequest deleteRequest) {
if (null == deleteRequest || StrUtil.isBlank(deleteRequest.getId())) { if (null == deleteRequest || StrUtil.isBlank(deleteRequest.getId())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空"); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空");
@ -80,6 +84,7 @@ public class InvSpaceController {
* @return * @return
*/ */
@PostMapping("/spms/inv/space/update") @PostMapping("/spms/inv/space/update")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse updateSpace(@RequestBody InvSpace invSpace, BindingResult bindingResult) { public BaseResponse updateSpace(@RequestBody InvSpace invSpace, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -6,9 +6,11 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.*; import com.glxp.api.entity.auth.*;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
@ -182,6 +184,7 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/sub/inv/warehouse/save") @PostMapping("/spms/sub/inv/warehouse/save")
@Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse save(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity, public BaseResponse save(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -220,6 +223,7 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/sub/inv/warehouse/edit") @PostMapping("/spms/sub/inv/warehouse/edit")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse edit(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity, public BaseResponse edit(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity,
BindingResult bindingResult, FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) { BindingResult bindingResult, FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
@ -260,6 +264,7 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/sub/inv/warehouse/delete") @PostMapping("/spms/sub/inv/warehouse/delete")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
if (deleteRequest.getId() == null) { if (deleteRequest.getId() == null) {
@ -324,6 +329,7 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/sub/inv/warehouse/bindThrWarehouse") @PostMapping("/spms/sub/inv/warehouse/bindThrWarehouse")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse bindThrWarehouse(String id, String thridWarehouseId, String sysId) { public BaseResponse bindThrWarehouse(String id, String thridWarehouseId, String sysId) {
if (null == id || null == thridWarehouseId || StrUtil.isBlank(sysId)) { if (null == id || null == thridWarehouseId || StrUtil.isBlank(sysId)) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -340,6 +346,7 @@ public class InvWarehouseController extends BaseController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/sub/inv/warehouse/unbindThrWarehouse") @PostMapping("/spms/sub/inv/warehouse/unbindThrWarehouse")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse unbindThrWarehouse(String id, String sysId) { public BaseResponse unbindThrWarehouse(String id, String sysId) {
if (null == id || StrUtil.isBlank(sysId)) { if (null == id || StrUtil.isBlank(sysId)) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -435,6 +442,7 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/invRelBusType/warehouse/post") @PostMapping("/spms/invRelBusType/warehouse/post")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse postRes(@RequestBody UpdateInvRelBusRequest relBusRequset) { public BaseResponse postRes(@RequestBody UpdateInvRelBusRequest relBusRequset) {
if (StrUtil.isEmpty(relBusRequset.getInvCode())) if (StrUtil.isEmpty(relBusRequset.getInvCode()))
return ResultVOUtils.error(500, "仓库编码不能为空!"); return ResultVOUtils.error(500, "仓库编码不能为空!");
@ -541,6 +549,7 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/delWarehouseUser") @PostMapping("/warehouse/inout/delWarehouseUser")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse deleteWarehouseUser(Integer id) { public BaseResponse deleteWarehouseUser(Integer id) {
if (null == id) if (null == id)
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -561,6 +570,7 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/addWarehouseUser") @PostMapping("/warehouse/inout/addWarehouseUser")
@Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse addWarehouseUser(@RequestBody Map<String, Object> params) { public BaseResponse addWarehouseUser(@RequestBody Map<String, Object> params) {
String code = String.valueOf(params.get("code")); String code = String.valueOf(params.get("code"));
String userListJson = String.valueOf(params.get("userList")); String userListJson = String.valueOf(params.get("userList"));

@ -2,6 +2,8 @@ package com.glxp.api.controller.auth;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.dao.auth.AuthLicenseDao; import com.glxp.api.dao.auth.AuthLicenseDao;
@ -268,6 +270,7 @@ public class LoginController extends BaseController {
*/ */
@AuthRuleAnnotation("") // 需要登录验证,但是不需要权限验证时,value 值填空字符串 @AuthRuleAnnotation("") // 需要登录验证,但是不需要权限验证时,value 值填空字符串
@PostMapping("/admin/auth/login/password") @PostMapping("/admin/auth/login/password")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse password(@RequestBody @Valid UpdatePasswordRequest updatePasswordRequest, public BaseResponse password(@RequestBody @Valid UpdatePasswordRequest updatePasswordRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -5,9 +5,11 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.CustomerInfoEntity; import com.glxp.api.entity.auth.CustomerInfoEntity;
import com.glxp.api.entity.auth.UserRegisterEntity; import com.glxp.api.entity.auth.UserRegisterEntity;
@ -178,6 +180,7 @@ public class RegisterController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("salewarehouse/register/deleteResiter") @PostMapping("salewarehouse/register/deleteResiter")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse deleteResiter(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteResiter(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -190,6 +193,7 @@ public class RegisterController {
} }
@PostMapping("salewarehouse/register/update") @PostMapping("salewarehouse/register/update")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse updateRegister(@RequestBody @Valid UserRegisterEntity userRegisterEntity, public BaseResponse updateRegister(@RequestBody @Valid UserRegisterEntity userRegisterEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -325,6 +329,7 @@ public class RegisterController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("salewarehouse/register/check") @PostMapping("salewarehouse/register/check")
@Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse checkRegister(@RequestBody @Valid RegisterCheckRequest registerCheckRequest, public BaseResponse checkRegister(@RequestBody @Valid RegisterCheckRequest registerCheckRequest,
BindingResult bindingResult) { BindingResult bindingResult) {

@ -2,6 +2,8 @@ package com.glxp.api.controller.auth;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.SysDictData; import com.glxp.api.entity.auth.SysDictData;
import com.glxp.api.req.auth.SysDictDataRequest; import com.glxp.api.req.auth.SysDictDataRequest;
@ -66,6 +68,7 @@ public class SysDictDataController extends BaseController {
* *
*/ */
@PostMapping @PostMapping
@Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse add(@Validated @RequestBody SysDictData dict) { public BaseResponse add(@Validated @RequestBody SysDictData dict) {
dictDataService.insertDictData(dict); dictDataService.insertDictData(dict);
return ResultVOUtils.success("添加成功!"); return ResultVOUtils.success("添加成功!");
@ -76,6 +79,7 @@ public class SysDictDataController extends BaseController {
*/ */
@SaCheckPermission("system:dict:edit") @SaCheckPermission("system:dict:edit")
@PutMapping @PutMapping
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse edit(@Validated @RequestBody SysDictData dict) { public BaseResponse edit(@Validated @RequestBody SysDictData dict) {
dictDataService.updateDictData(dict); dictDataService.updateDictData(dict);
return ResultVOUtils.success("修改成功!"); return ResultVOUtils.success("修改成功!");
@ -88,6 +92,7 @@ public class SysDictDataController extends BaseController {
*/ */
@SaCheckPermission("system:dict:remove") @SaCheckPermission("system:dict:remove")
@DeleteMapping("/{dictCodes}") @DeleteMapping("/{dictCodes}")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse remove(@PathVariable Long[] dictCodes) { public BaseResponse remove(@PathVariable Long[] dictCodes) {
dictDataService.deleteDictDataByIds(dictCodes); dictDataService.deleteDictDataByIds(dictCodes);
return ResultVOUtils.success("移除成功!"); return ResultVOUtils.success("移除成功!");

@ -3,6 +3,8 @@ package com.glxp.api.controller.auth;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.SysDictType; import com.glxp.api.entity.auth.SysDictType;
@ -54,6 +56,7 @@ public class SysDictTypeController extends BaseController {
* *
*/ */
@PostMapping @PostMapping
@Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse add(@Validated @RequestBody SysDictType dict) { public BaseResponse add(@Validated @RequestBody SysDictType dict) {
if (Constant.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { if (Constant.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
return ResultVOUtils.error(500, "新增字典'" + dict.getDictName() + "'失败,字典类型已存在"); return ResultVOUtils.error(500, "新增字典'" + dict.getDictName() + "'失败,字典类型已存在");
@ -66,6 +69,7 @@ public class SysDictTypeController extends BaseController {
* *
*/ */
@PutMapping @PutMapping
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse edit(@Validated @RequestBody SysDictType dict) { public BaseResponse edit(@Validated @RequestBody SysDictType dict) {
// if (Constant.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { // if (Constant.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
// return R.fail("修改字典'" + dict.getDictName() + "'失败,字典类型已存在"); // return R.fail("修改字典'" + dict.getDictName() + "'失败,字典类型已存在");
@ -81,6 +85,7 @@ public class SysDictTypeController extends BaseController {
*/ */
@SaCheckPermission("system:dict:remove") @SaCheckPermission("system:dict:remove")
@DeleteMapping("/{dictIds}") @DeleteMapping("/{dictIds}")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse remove(@PathVariable Long[] dictIds) { public BaseResponse remove(@PathVariable Long[] dictIds) {
dictTypeService.deleteDictTypeByIds(dictIds); dictTypeService.deleteDictTypeByIds(dictIds);
return ResultVOUtils.success("删除成功!"); return ResultVOUtils.success("删除成功!");

@ -2,6 +2,8 @@ package com.glxp.api.controller.auth;
import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.Tree;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
@ -85,6 +87,7 @@ public class SysMenuController extends BaseController {
* *
*/ */
@PostMapping @PostMapping
@Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse add(@Validated @RequestBody SysMenu menu) { public BaseResponse add(@Validated @RequestBody SysMenu menu) {
if (Constant.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { if (Constant.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
return ResultVOUtils.error(500, "新增菜单'" + menu.getMenuName() + "'失败,菜单名称已存在"); return ResultVOUtils.error(500, "新增菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
@ -101,6 +104,7 @@ public class SysMenuController extends BaseController {
* *
*/ */
@PutMapping @PutMapping
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse edit(@Validated @RequestBody SysMenu menu) { public BaseResponse edit(@Validated @RequestBody SysMenu menu) {
menu.setNeMenuId(menu.getMenuId()); menu.setNeMenuId(menu.getMenuId());
if (Constant.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { if (Constant.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
@ -120,6 +124,7 @@ public class SysMenuController extends BaseController {
* @param menuId ID * @param menuId ID
*/ */
@DeleteMapping("/{menuId}") @DeleteMapping("/{menuId}")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse remove(@PathVariable("menuId") Long menuId) { public BaseResponse remove(@PathVariable("menuId") Long menuId) {
if (menuService.hasChildByMenuId(menuId)) { if (menuService.hasChildByMenuId(menuId)) {
return ResultVOUtils.error(500, "存在子菜单,不允许删除"); return ResultVOUtils.error(500, "存在子菜单,不允许删除");

@ -2,6 +2,8 @@ package com.glxp.api.controller.auth;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
@ -64,6 +66,7 @@ public class SysRoleController extends BaseController {
* *
*/ */
@PostMapping @PostMapping
@Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse add(@Validated @RequestBody SysRole role) { public BaseResponse add(@Validated @RequestBody SysRole role) {
role.setRoleKey(UUID.randomUUID() + ""); role.setRoleKey(UUID.randomUUID() + "");
if (Constant.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { if (Constant.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
@ -83,6 +86,7 @@ public class SysRoleController extends BaseController {
* *
*/ */
@PutMapping @PutMapping
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse edit(@Validated @RequestBody SysRole role) { public BaseResponse edit(@Validated @RequestBody SysRole role) {
roleService.checkRoleAllowed(role); roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId()); roleService.checkRoleDataScope(role.getRoleId());
@ -105,6 +109,7 @@ public class SysRoleController extends BaseController {
* *
*/ */
@PutMapping("/dataScope") @PutMapping("/dataScope")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse dataScope(@RequestBody SysRole role) { public BaseResponse dataScope(@RequestBody SysRole role) {
roleService.checkRoleAllowed(role); roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId()); roleService.checkRoleDataScope(role.getRoleId());
@ -118,6 +123,7 @@ public class SysRoleController extends BaseController {
* *
*/ */
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse changeStatus(@RequestBody SysRole role) { public BaseResponse changeStatus(@RequestBody SysRole role) {
roleService.checkRoleAllowed(role); roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId()); roleService.checkRoleDataScope(role.getRoleId());
@ -131,6 +137,7 @@ public class SysRoleController extends BaseController {
* @param roleIds ID * @param roleIds ID
*/ */
@DeleteMapping("/{roleIds}") @DeleteMapping("/{roleIds}")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse remove(@PathVariable Long[] roleIds) { public BaseResponse remove(@PathVariable Long[] roleIds) {
int i = roleService.deleteRoleByIds(roleIds); int i = roleService.deleteRoleByIds(roleIds);
if(i>0){ if(i>0){
@ -184,6 +191,7 @@ public class SysRoleController extends BaseController {
* *
*/ */
@PutMapping("/authUser/cancel") @PutMapping("/authUser/cancel")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse cancelAuthUser(@RequestBody SysUserRole userRole) { public BaseResponse cancelAuthUser(@RequestBody SysUserRole userRole) {
int i = roleService.deleteAuthUser(userRole); int i = roleService.deleteAuthUser(userRole);
return ResultVOUtils.success("取消成功!"); return ResultVOUtils.success("取消成功!");
@ -197,6 +205,7 @@ public class SysRoleController extends BaseController {
*/ */
@SaCheckPermission("system:role:edit") @SaCheckPermission("system:role:edit")
@PutMapping("/authUser/cancelAll") @PutMapping("/authUser/cancelAll")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse cancelAuthUserAll(Long roleId, Long[] userIds) { public BaseResponse cancelAuthUserAll(Long roleId, Long[] userIds) {
int i = roleService.deleteAuthUsers(roleId, userIds); int i = roleService.deleteAuthUsers(roleId, userIds);

@ -135,6 +135,7 @@ public class SysUserController extends BaseController {
* @param userId Id * @param userId Id
* @param roleIds ID * @param roleIds ID
*/ */
@Log(title = "用户管理", businessType = BusinessType.GRANT)
@SaCheckPermission("system:user:edit") @SaCheckPermission("system:user:edit")
@PutMapping("/authRole") @PutMapping("/authRole")
public BaseResponse inseinsertUserAuthrtAuthRole(Long userId, Long[] roleIds) { public BaseResponse inseinsertUserAuthrtAuthRole(Long userId, Long[] roleIds) {

@ -2,9 +2,11 @@ package com.glxp.api.controller.basic;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypeChangeRequest;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
@ -58,6 +60,7 @@ public class BasicBusTypeChangeController {
* @return * @return
*/ */
@PostMapping("/basic/bustype/change/insert") @PostMapping("/basic/bustype/change/insert")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse insertBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity, BindingResult bindingResult) { public BaseResponse insertBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -79,6 +82,7 @@ public class BasicBusTypeChangeController {
* @return * @return
*/ */
@PostMapping("/basic/bustype/change/update") @PostMapping("/basic/bustype/change/update")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity, BindingResult bindingResult) { public BaseResponse updateBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -100,6 +104,7 @@ public class BasicBusTypeChangeController {
* @return * @return
*/ */
@PostMapping("/basic/bustype/change/delete") @PostMapping("/basic/bustype/change/delete")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse delBussinessType(@RequestBody @Valid DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse delBussinessType(@RequestBody @Valid DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -3,9 +3,11 @@ package com.glxp.api.controller.basic;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType; import com.glxp.api.constant.ConstantType;
import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.auth.InvWarehouseEntity;
@ -119,6 +121,7 @@ public class BasicBusTypePreController {
* @return * @return
*/ */
@PostMapping("/spms/busTypePre/remove") @PostMapping("/spms/busTypePre/remove")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse removeBuTypePre(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) { public BaseResponse removeBuTypePre(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -140,6 +143,7 @@ public class BasicBusTypePreController {
* @return * @return
*/ */
@PostMapping("/spms/busTypePre/delete") @PostMapping("/spms/busTypePre/delete")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deleteBusTypePre(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteBusTypePre(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -157,6 +161,7 @@ public class BasicBusTypePreController {
* @return * @return
*/ */
@PostMapping("/spms/busTypePre/update") @PostMapping("/spms/busTypePre/update")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateBusTypePre(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) { public BaseResponse updateBusTypePre(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -183,6 +188,7 @@ public class BasicBusTypePreController {
* @return * @return
*/ */
@PostMapping("/spms/busTypePre/insert") @PostMapping("/spms/busTypePre/insert")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse insertBusTypePre(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) { public BaseResponse insertBusTypePre(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -6,9 +6,11 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantType; import com.glxp.api.constant.ConstantType;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
@ -124,6 +126,7 @@ public class BasicBussinessTypeController extends BaseController {
* @return * @return
*/ */
@PostMapping(value = "/udiwms/bussinessType/insert") @PostMapping(value = "/udiwms/bussinessType/insert")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse insertBussinessType(@RequestBody @Valid BussinessTypeSaveRequest bussinessTypeSaveRequest, BindingResult bindingResult) { public BaseResponse insertBussinessType(@RequestBody @Valid BussinessTypeSaveRequest bussinessTypeSaveRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -152,6 +155,7 @@ public class BasicBussinessTypeController extends BaseController {
* @return * @return
*/ */
@PostMapping("/udiwms/bussinessType/update") @PostMapping("/udiwms/bussinessType/update")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateBussinessType(@RequestBody BussinessTypeSaveRequest bussinessTypeSaveRequest, public BaseResponse updateBussinessType(@RequestBody BussinessTypeSaveRequest bussinessTypeSaveRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -225,6 +229,7 @@ public class BasicBussinessTypeController extends BaseController {
* @return * @return
*/ */
@PostMapping("/udiwms/bussinessType/delete") @PostMapping("/udiwms/bussinessType/delete")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -2,9 +2,11 @@ package com.glxp.api.controller.basic;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.system.SystemParamConfigEntity;
@ -106,6 +108,7 @@ public class BasicCorpController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/save") @PostMapping("/udiwms/basic/unit/maintain/save")
@Log(title = "往来单位信息", businessType = BusinessType.INSERT)
public BaseResponse save(@RequestBody @Valid BasicCorpEntity basicUnitMaintainSaveRequest, public BaseResponse save(@RequestBody @Valid BasicCorpEntity basicUnitMaintainSaveRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -133,6 +136,7 @@ public class BasicCorpController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/update") @PostMapping("/udiwms/basic/unit/maintain/update")
@Log(title = "往来单位信息", businessType = BusinessType.UPDATE)
public BaseResponse update(@RequestBody @Valid BasicCorpEntity basicUnitMaintainSaveRequest,BindingResult bindingResult) { public BaseResponse update(@RequestBody @Valid BasicCorpEntity basicUnitMaintainSaveRequest,BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -203,6 +207,7 @@ public class BasicCorpController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/combine") @PostMapping("/udiwms/basic/unit/maintain/combine")
@Log(title = "往来单位信息", businessType = BusinessType.INSERT)
public BaseResponse combine(@RequestBody CombineUnitRequest combineRequest, BindingResult bindingResult) { public BaseResponse combine(@RequestBody CombineUnitRequest combineRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -268,6 +273,7 @@ public class BasicCorpController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/combineSingle") @PostMapping("/udiwms/basic/unit/maintain/combineSingle")
@Log(title = "往来单位信息", businessType = BusinessType.UPDATE)
public BaseResponse combineSingle(@RequestBody CombineSingleUnitRequest combineRequest, BindingResult bindingResult) { public BaseResponse combineSingle(@RequestBody CombineSingleUnitRequest combineRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -302,6 +308,7 @@ public class BasicCorpController {
//解除绑定 //解除绑定
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/unit/thirdSys/removeRl") @GetMapping("/udiwms/unit/thirdSys/removeRl")
@Log(title = "往来单位信息", businessType = BusinessType.UPDATE)
public BaseResponse uploadThirdServcie(RemoveRelRequest removeRelRequest) { public BaseResponse uploadThirdServcie(RemoveRelRequest removeRelRequest) {
BasicCorpEntity basicCorpEntity = basicUnitMaintainService.selectById(removeRelRequest.getRelId()); BasicCorpEntity basicCorpEntity = basicUnitMaintainService.selectById(removeRelRequest.getRelId());
if (removeRelRequest.getThirdSys().equals("thirdId")) { if (removeRelRequest.getThirdSys().equals("thirdId")) {
@ -327,6 +334,7 @@ public class BasicCorpController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/delete") @PostMapping("/udiwms/basic/unit/maintain/delete")
@Log(title = "往来单位信息", businessType = BusinessType.DELETE)
public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -1,10 +1,12 @@
package com.glxp.api.controller.basic; package com.glxp.api.controller.basic;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.basic.BasicCorpsExportLogEntity; import com.glxp.api.entity.basic.BasicCorpsExportLogEntity;
import com.glxp.api.req.basic.BasicCorpsExportRequest; import com.glxp.api.req.basic.BasicCorpsExportRequest;
@ -59,6 +61,7 @@ public class BasicCorpExportLogController {
} }
@PostMapping("/udiwms/corps/exportLog/deleteLog") @PostMapping("/udiwms/corps/exportLog/deleteLog")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -71,6 +74,7 @@ public class BasicCorpExportLogController {
//往来单位excel文件下载 //往来单位excel文件下载
@GetMapping("/udiwms/corps/exportLog/download") @GetMapping("/udiwms/corps/exportLog/download")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public void download(FilterCorpExportLogRequest filterCorpExportLogRequest, HttpServletResponse res) { public void download(FilterCorpExportLogRequest filterCorpExportLogRequest, HttpServletResponse res) {
List<BasicCorpsExportLogEntity> corpExportLogEntities = basicCorpExportLogService.filterCorpExportLog(filterCorpExportLogRequest); List<BasicCorpsExportLogEntity> corpExportLogEntities = basicCorpExportLogService.filterCorpExportLog(filterCorpExportLogRequest);
@ -107,6 +111,7 @@ public class BasicCorpExportLogController {
//往来单位导出生成Excel并创建生成记录 //往来单位导出生成Excel并创建生成记录
@PostMapping("/udiwms/corps/importLog/export") @PostMapping("/udiwms/corps/importLog/export")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse excelDownload(@RequestBody BasicCorpsExportRequest basicCorpsExportRequest) { public BaseResponse excelDownload(@RequestBody BasicCorpsExportRequest basicCorpsExportRequest) {
String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".UpperIn"; String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".UpperIn";
BasicCorpsExportLogEntity corpExportLogEntity = new BasicCorpsExportLogEntity(); BasicCorpsExportLogEntity corpExportLogEntity = new BasicCorpsExportLogEntity();
@ -127,6 +132,7 @@ public class BasicCorpExportLogController {
//往来单位上传SMP并创建生成记录 //往来单位上传SMP并创建生成记录
@PostMapping("/udiwms/corps/importLog/uploadSmp") @PostMapping("/udiwms/corps/importLog/uploadSmp")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse uploadSmp(@RequestBody BasicCorpsExportRequest basicCorpsExportRequest) { public BaseResponse uploadSmp(@RequestBody BasicCorpsExportRequest basicCorpsExportRequest) {
BasicCorpsExportLogEntity corpExportLogEntity = new BasicCorpsExportLogEntity(); BasicCorpsExportLogEntity corpExportLogEntity = new BasicCorpsExportLogEntity();
corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);

@ -3,10 +3,12 @@ package com.glxp.api.controller.basic;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.basic.BasicCorpsImportDetailEntity; import com.glxp.api.entity.basic.BasicCorpsImportDetailEntity;
import com.glxp.api.entity.basic.BasicCorpsImportLogEntity; import com.glxp.api.entity.basic.BasicCorpsImportLogEntity;
import com.glxp.api.req.basic.FilterCorpImportLogRequest; import com.glxp.api.req.basic.FilterCorpImportLogRequest;
@ -56,6 +58,7 @@ public class BasicCorpImportLogController {
} }
@PostMapping("/udiwms/corps/importLog/deleteLog") @PostMapping("/udiwms/corps/importLog/deleteLog")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -75,6 +78,7 @@ public class BasicCorpImportLogController {
//往来单位信息文件导入 //往来单位信息文件导入
@PostMapping("/udiwms/corps/importLog/upload") @PostMapping("/udiwms/corps/importLog/upload")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse uploadCorp(@RequestParam("file") List<MultipartFile> files, @RequestParam("thirdSys") String thirdSys) { public BaseResponse uploadCorp(@RequestParam("file") List<MultipartFile> files, @RequestParam("thirdSys") String thirdSys) {
String filePath = "D:\\udiwms\\filePath\\"; String filePath = "D:\\udiwms\\filePath\\";
File createFile = new File(filePath); File createFile = new File(filePath);

@ -2,8 +2,10 @@ package com.glxp.api.controller.basic;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.basic.BasicCorpsExportLogEntity; import com.glxp.api.entity.basic.BasicCorpsExportLogEntity;
import com.glxp.api.entity.basic.BasicProductsExportLogEntity; import com.glxp.api.entity.basic.BasicProductsExportLogEntity;
@ -54,6 +56,7 @@ public class BasicGenExcelService {
// //
//往来单位导出excel文件 //往来单位导出excel文件
@Async @Async
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public void exportCorp(String genKey, BasicCorpsExportRequest basicCorpsExportRequest) { public void exportCorp(String genKey, BasicCorpsExportRequest basicCorpsExportRequest) {
BasicCorpsExportLogEntity corpExportLogEntity = basicCorpExportLogService.selectByGenKey(genKey); BasicCorpsExportLogEntity corpExportLogEntity = basicCorpExportLogService.selectByGenKey(genKey);
@ -179,6 +182,7 @@ public class BasicGenExcelService {
// //
// //
@Async @Async
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public void uploadCorpSmpJson(String genKey, BasicCorpExportLogResponse exportData) { public void uploadCorpSmpJson(String genKey, BasicCorpExportLogResponse exportData) {
BasicCorpsExportLogEntity corpExportLogEntity = basicCorpExportLogService.selectByGenKey(genKey); BasicCorpsExportLogEntity corpExportLogEntity = basicCorpExportLogService.selectByGenKey(genKey);
@ -248,6 +252,7 @@ public class BasicGenExcelService {
// } // }
// //
@Async @Async
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public void uploadProductsSmpJson(String genKey, UdiRelevanceExportJsonResponse exportData) { public void uploadProductsSmpJson(String genKey, UdiRelevanceExportJsonResponse exportData) {
BasicProductsExportLogEntity basicProductsExportLogEntity = basicProductsExportLogService.selectByGenKey(genKey); BasicProductsExportLogEntity basicProductsExportLogEntity = basicProductsExportLogService.selectByGenKey(genKey);
// String response = HttpClient.uCloudPost(spsSyncUrl + "/udiwms/basic/products/upload", exportData); // String response = HttpClient.uCloudPost(spsSyncUrl + "/udiwms/basic/products/upload", exportData);

@ -2,9 +2,11 @@ package com.glxp.api.controller.basic;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.basic.BasicHospTypeEntity; import com.glxp.api.entity.basic.BasicHospTypeEntity;
import com.glxp.api.req.basic.BasicHospTypeFilterRequest; import com.glxp.api.req.basic.BasicHospTypeFilterRequest;
import com.glxp.api.req.basic.BasicHospTypeRequest; import com.glxp.api.req.basic.BasicHospTypeRequest;
@ -74,6 +76,7 @@ public class BasicHospTypeController {
@PostMapping("/udiwms/basic/hosp/type/update") @PostMapping("/udiwms/basic/hosp/type/update")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse update(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { public BaseResponse update(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -88,6 +91,7 @@ public class BasicHospTypeController {
} }
@GetMapping("/udiwms/basic/hosp/type/delect") @GetMapping("/udiwms/basic/hosp/type/delect")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse delect(BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { public BaseResponse delect(BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -132,6 +136,7 @@ public class BasicHospTypeController {
@PostMapping("/udiwms/basic/hosp/type/unbindRel") @PostMapping("/udiwms/basic/hosp/type/unbindRel")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -3,9 +3,11 @@ package com.glxp.api.controller.basic;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inout.IoOrderEntity;
@ -69,6 +71,7 @@ public class BasicInCodeController {
} }
@PostMapping("/udiwms/stock/order/addOrderPrint") @PostMapping("/udiwms/stock/order/addOrderPrint")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) { public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) {
if (invInnerOrderprintReques.getOrderIdFk() != null) { if (invInnerOrderprintReques.getOrderIdFk() != null) {

@ -2,8 +2,10 @@ package com.glxp.api.controller.basic;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.basic.BasicProductSetEntity; import com.glxp.api.entity.basic.BasicProductSetEntity;
import com.glxp.api.req.basic.FilterBasicProductSetrequest; import com.glxp.api.req.basic.FilterBasicProductSetrequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
@ -37,6 +39,7 @@ public class BasicProductSetController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/basicProduct/setup/modify") @PostMapping("/spms/basicProduct/setup/modify")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse modifySetup(@RequestBody BasicProductSetEntity basicProductSetEntity) { public BaseResponse modifySetup(@RequestBody BasicProductSetEntity basicProductSetEntity) {
basicProductSetService.updateSetup(basicProductSetEntity); basicProductSetService.updateSetup(basicProductSetEntity);
return ResultVOUtils.success("修改成功"); return ResultVOUtils.success("修改成功");

@ -1,10 +1,12 @@
package com.glxp.api.controller.basic; package com.glxp.api.controller.basic;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.basic.BasicProductsExportLogEntity; import com.glxp.api.entity.basic.BasicProductsExportLogEntity;
import com.glxp.api.req.basic.FilterUdiEpLogRequest; import com.glxp.api.req.basic.FilterUdiEpLogRequest;
import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.basic.FilterUdiRelRequest;
@ -67,6 +69,7 @@ public class BasicProductsExportLogController {
} }
@PostMapping("/udiwms/products/exportLog/deleteLog") @PostMapping("/udiwms/products/exportLog/deleteLog")
@Log(title = "医疗器械信息", businessType = BusinessType.DELETE)
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -79,6 +82,7 @@ public class BasicProductsExportLogController {
//产品信息excel文件下载 //产品信息excel文件下载
@GetMapping("/udiwms/products/exportLog/download") @GetMapping("/udiwms/products/exportLog/download")
@Log(title = "医疗器械信息", businessType = BusinessType.UPDATE)
public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) {
List<BasicProductsExportLogEntity> udiInfoExportLogEntities = basicProductsExportLogService.filterUdiInfoExportLog(filterUdiEpLogRequest); List<BasicProductsExportLogEntity> udiInfoExportLogEntities = basicProductsExportLogService.filterUdiInfoExportLog(filterUdiEpLogRequest);
@ -115,6 +119,7 @@ public class BasicProductsExportLogController {
//产品信息导出生成Excel并创建生成记录 //产品信息导出生成Excel并创建生成记录
@PostMapping("/udiwms/products/importLog/export") @PostMapping("/udiwms/products/importLog/export")
@Log(title = "医疗器械信息", businessType = BusinessType.INSERT)
public BaseResponse excelDownload(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { public BaseResponse excelDownload(@RequestBody UdiInfoExportRequest udiInfoExportRequest) {
BasicProductsExportLogEntity basicProductsExportLogEntity = new BasicProductsExportLogEntity(); BasicProductsExportLogEntity basicProductsExportLogEntity = new BasicProductsExportLogEntity();
basicProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); basicProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
@ -134,6 +139,7 @@ public class BasicProductsExportLogController {
//产品信息上传SMP并创建生成记录 //产品信息上传SMP并创建生成记录
@PostMapping("/udiwms/products/importLog/uploadSmp") @PostMapping("/udiwms/products/importLog/uploadSmp")
@Log(title = "医疗器械信息", businessType = BusinessType.INSERT)
public BaseResponse uploadSmp(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { public BaseResponse uploadSmp(@RequestBody UdiInfoExportRequest udiInfoExportRequest) {
BasicProductsExportLogEntity basicProductsExportLogEntity = new BasicProductsExportLogEntity(); BasicProductsExportLogEntity basicProductsExportLogEntity = new BasicProductsExportLogEntity();

@ -3,10 +3,12 @@ package com.glxp.api.controller.basic;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.basic.BasicProductsImportDetailEntity; import com.glxp.api.entity.basic.BasicProductsImportDetailEntity;
import com.glxp.api.entity.basic.BasicProductsImportLogEntity; import com.glxp.api.entity.basic.BasicProductsImportLogEntity;
import com.glxp.api.req.basic.FilterUdiIpLogRequest; import com.glxp.api.req.basic.FilterUdiIpLogRequest;
@ -83,6 +85,7 @@ public class BasicProductsImportLogController {
@PostMapping("/udiwms/products/importLog/deleteLog") @PostMapping("/udiwms/products/importLog/deleteLog")
@Log(title = "医疗器械信息", businessType = BusinessType.DELETE)
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -102,6 +105,7 @@ public class BasicProductsImportLogController {
} }
@PostMapping("/udiwms/products/importLog/delete") @PostMapping("/udiwms/products/importLog/delete")
@Log(title = "医疗器械信息", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -116,6 +120,7 @@ public class BasicProductsImportLogController {
//产品信息文件导入 //产品信息文件导入
@PostMapping("/udiwms/products/importLog/upload") @PostMapping("/udiwms/products/importLog/upload")
@Log(title = "医疗器械信息", businessType = BusinessType.INSERT)
public BaseResponse uploadProducts(@RequestParam("file") List<MultipartFile> files, @RequestParam("thirdSys") String thirdSys) { public BaseResponse uploadProducts(@RequestParam("file") List<MultipartFile> files, @RequestParam("thirdSys") String thirdSys) {
String filePath = "D:\\udiwms\\filePath\\"; String filePath = "D:\\udiwms\\filePath\\";
File createFile = new File(filePath); File createFile = new File(filePath);
@ -201,6 +206,7 @@ public class BasicProductsImportLogController {
//产品信息接口上传 //产品信息接口上传
@PostMapping("/udiwms/basic/products/upload") @PostMapping("/udiwms/basic/products/upload")
@Log(title = "医疗器械信息", businessType = BusinessType.INSERT)
public BaseResponse postUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, BindingResult bindingResult) { public BaseResponse postUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -238,6 +244,7 @@ public class BasicProductsImportLogController {
//扫码精灵产品信息接口上传 //扫码精灵产品信息接口上传
@PostMapping("/udiwms/basic/products/srUpload") @PostMapping("/udiwms/basic/products/srUpload")
@Log(title = "医疗器械信息", businessType = BusinessType.INSERT)
public BaseResponse postSrUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, BindingResult bindingResult) { public BaseResponse postSrUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -274,6 +281,7 @@ public class BasicProductsImportLogController {
//供应商平台产品信息下载 //供应商平台产品信息下载
@GetMapping("/udiwms/products/smp/download") @GetMapping("/udiwms/products/smp/download")
@Log(title = "医疗器械信息", businessType = BusinessType.INSERT)
public BaseResponse downloadSmpUdi(FilterUdiIpLogRequest filterUdiIpLogRequest, public BaseResponse downloadSmpUdi(FilterUdiIpLogRequest filterUdiIpLogRequest,
BindingResult bindingResult) { BindingResult bindingResult) {

@ -2,8 +2,10 @@ package com.glxp.api.controller.basic;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.auth.InvWarehouseEntity;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
@ -74,6 +76,7 @@ public class EntrustReceController extends BaseController {
InvWarehouseService invWarehouseService; InvWarehouseService invWarehouseService;
@PostMapping("/spms/entrust/rece/add") @PostMapping("/spms/entrust/rece/add")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse aadEntrustRece(@RequestBody EntrustReceEntity entrustReceEntity) { public BaseResponse aadEntrustRece(@RequestBody EntrustReceEntity entrustReceEntity) {
entrustReceEntity.setUserId(getUserId()); entrustReceEntity.setUserId(getUserId());
entrustReceEntity.setUpdateTime(new Date()); entrustReceEntity.setUpdateTime(new Date());
@ -106,6 +109,7 @@ public class EntrustReceController extends BaseController {
@PostMapping("/spms/entrust/rece/update") @PostMapping("/spms/entrust/rece/update")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateEntrustRece(@RequestBody EntrustReceEntity entrustReceEntity) { public BaseResponse updateEntrustRece(@RequestBody EntrustReceEntity entrustReceEntity) {
if (StrUtil.isEmpty(entrustReceEntity.getCurInv())) { if (StrUtil.isEmpty(entrustReceEntity.getCurInv())) {
return ResultVOUtils.error(500, "当前仓库不能为空!"); return ResultVOUtils.error(500, "当前仓库不能为空!");
@ -130,6 +134,7 @@ public class EntrustReceController extends BaseController {
} }
@PostMapping("/spms/entrust/rece/delete") @PostMapping("/spms/entrust/rece/delete")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) { public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) {
boolean b = entrustReceService.deleteById(deleteRequest.getId()); boolean b = entrustReceService.deleteById(deleteRequest.getId());

@ -4,8 +4,10 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.ProductInfoEntity;
@ -72,6 +74,7 @@ public class UdiContrastController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udi/udirel/revleance") @PostMapping("/udi/udirel/revleance")
@Log(title = "耗材字典", businessType = BusinessType.INSERT)
public BaseResponse revleanceUdi(@RequestBody UdiCombineRequest udiCombineRequest) { public BaseResponse revleanceUdi(@RequestBody UdiCombineRequest udiCombineRequest) {
udiCombineRequest.setCustomerId(Long.valueOf(customerService.getCustomerId())); udiCombineRequest.setCustomerId(Long.valueOf(customerService.getCustomerId()));
List<String> keys = udiCombineRequest.getKeys(); List<String> keys = udiCombineRequest.getKeys();
@ -141,6 +144,7 @@ public class UdiContrastController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udi/udirel/changeVersion") @PostMapping("/udi/udirel/changeVersion")
@Log(title = "耗材字典", businessType = BusinessType.UPDATE)
public BaseResponse changeVersion(@RequestBody UdiCombineRequest udiCombineRequest) { public BaseResponse changeVersion(@RequestBody UdiCombineRequest udiCombineRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(udiCombineRequest.getRelId()); UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(udiCombineRequest.getRelId());
if (udiContrastService.isExit(udiCombineRequest.getKeys().get(0), udiRelevanceEntity.getMainId(), null)) { if (udiContrastService.isExit(udiCombineRequest.getKeys().get(0), udiRelevanceEntity.getMainId(), null)) {
@ -165,6 +169,7 @@ public class UdiContrastController {
//更改关联第三方产品产品信息 //更改关联第三方产品产品信息
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udi/udirel/modifyRel") @PostMapping("/udi/udirel/modifyRel")
@Log(title = "耗材字典", businessType = BusinessType.UPDATE)
public BaseResponse modifyRel(@RequestBody UdiCombineRequest udiCombineRequest) { public BaseResponse modifyRel(@RequestBody UdiCombineRequest udiCombineRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(udiCombineRequest.getRelId()); UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(udiCombineRequest.getRelId());
udiRelevanceEntity = setThird(udiCombineRequest, udiRelevanceEntity); udiRelevanceEntity = setThird(udiCombineRequest, udiRelevanceEntity);
@ -199,6 +204,7 @@ public class UdiContrastController {
//解除绑定第三方产品信息 //解除绑定第三方产品信息
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/udirl/thirdSys/remove") @GetMapping("/udiwms/udirl/thirdSys/remove")
@Log(title = "耗材字典", businessType = BusinessType.UPDATE)
public BaseResponse removeThirdId(RemoveUdiRelRequest removeUdiRelRequest) { public BaseResponse removeThirdId(RemoveUdiRelRequest removeUdiRelRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeUdiRelRequest.getRelId()); UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeUdiRelRequest.getRelId());
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.selectByUuid(udiRelevanceEntity.getUuid()); List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.selectByUuid(udiRelevanceEntity.getUuid());
@ -241,6 +247,7 @@ public class UdiContrastController {
//解除绑定DI器械信息 //解除绑定DI器械信息
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/udirl/di/remove") @GetMapping("/udiwms/udirl/di/remove")
@Log(title = "耗材字典", businessType = BusinessType.UPDATE)
public BaseResponse removeDI(RemoveUdiRelRequest removeRelRequest) { public BaseResponse removeDI(RemoveUdiRelRequest removeRelRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId()); UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId());
if (StrUtil.isEmpty(udiRelevanceEntity.getMainId())) { if (StrUtil.isEmpty(udiRelevanceEntity.getMainId())) {

@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.basic.*; import com.glxp.api.entity.basic.*;
@ -232,6 +234,7 @@ public class UdiRelevanceController extends BaseController {
//多选删除 //多选删除
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udi/udirel/deleteAll") @PostMapping("/udi/udirel/deleteAll")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deleteAll(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteAll(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -244,6 +247,7 @@ public class UdiRelevanceController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udi/udirel/deleteById") @PostMapping("/udi/udirel/deleteById")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deleteById(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteById(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -300,6 +304,7 @@ public class UdiRelevanceController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udi/udirel/update") @PostMapping("/udi/udirel/update")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateRelevanceEntity(@RequestBody UdiRelevanceSaveRequest udiRelevanceSaveRequest, BindingResult bindingResult) { public BaseResponse updateRelevanceEntity(@RequestBody UdiRelevanceSaveRequest udiRelevanceSaveRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -358,6 +363,7 @@ public class UdiRelevanceController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udi/udirel/update/di") @PostMapping("/udi/udirel/update/di")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateSingel(@RequestBody UdiRelevanceSaveRequest udiRelevanceSaveRequest, BindingResult bindingResult) { public BaseResponse updateSingel(@RequestBody UdiRelevanceSaveRequest udiRelevanceSaveRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -388,6 +394,7 @@ public class UdiRelevanceController extends BaseController {
//新增或修改关联 //新增或修改关联
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udi/udirel/check/udi") @PostMapping("/udi/udirel/check/udi")
public BaseResponse checkUdi(@RequestBody UdiCombineRequest udiCombineRequest) { public BaseResponse checkUdi(@RequestBody UdiCombineRequest udiCombineRequest) {
List<String> keys = udiCombineRequest.getKeys(); List<String> keys = udiCombineRequest.getKeys();
@ -448,6 +455,7 @@ public class UdiRelevanceController extends BaseController {
//单独选入ERP产品 //单独选入ERP产品
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udi/udirel/addErp") @PostMapping("/udi/udirel/addErp")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse addErp(@RequestBody UdiCombineRequest udiCombineRequest) { public BaseResponse addErp(@RequestBody UdiCombineRequest udiCombineRequest) {
String errMsg = null; String errMsg = null;
@ -465,6 +473,7 @@ public class UdiRelevanceController extends BaseController {
//一键选入ERP产品 //一键选入ERP产品
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udi/udirel/addAllErp") @PostMapping("/udi/udirel/addAllErp")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse addAllErp(@RequestBody UdiCombineRequest udiCombineRequest) { public BaseResponse addAllErp(@RequestBody UdiCombineRequest udiCombineRequest) {
if (udiCombineRequest.getIsRlInv() != null && udiCombineRequest.getIsRlInv()) { if (udiCombineRequest.getIsRlInv() != null && udiCombineRequest.getIsRlInv()) {
@ -644,6 +653,7 @@ public class UdiRelevanceController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/udirl/lock/status") @PostMapping("/udiwms/udirl/lock/status")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse uploadThirdServcie(@RequestBody LockUdiRequest lockUdiRequest) { public BaseResponse uploadThirdServcie(@RequestBody LockUdiRequest lockUdiRequest) {
if (lockUdiRequest.getLockStatus() != null && lockUdiRequest.getIds().size() > 0) { if (lockUdiRequest.getLockStatus() != null && lockUdiRequest.getIds().size() > 0) {
for (Long id : lockUdiRequest.getIds()) { for (Long id : lockUdiRequest.getIds()) {
@ -661,6 +671,7 @@ public class UdiRelevanceController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udi/udirel/updateById") @PostMapping("/udi/udirel/updateById")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateById(@RequestBody UdiProductEntity udiProductEntity, BindingResult bindingResult) { public BaseResponse updateById(@RequestBody UdiProductEntity udiProductEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.basic.*; import com.glxp.api.entity.basic.*;
@ -192,6 +194,7 @@ public class UdiRlSupController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sale/info/insertCompanyProductRelevance") @PostMapping("/sale/info/insertCompanyProductRelevance")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse insertCompanyProductRelevance(@RequestBody UdiRlSupEntity udiRlSupEntity) { public BaseResponse insertCompanyProductRelevance(@RequestBody UdiRlSupEntity udiRlSupEntity) {
if (udiRlSupService.findCompanyProductRelevanceByProductUuid(udiRlSupEntity) != null) { if (udiRlSupService.findCompanyProductRelevanceByProductUuid(udiRlSupEntity) != null) {
return ResultVOUtils.error(ResultEnum.DATA_REPEAT); return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
@ -206,6 +209,7 @@ public class UdiRlSupController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sale/info/insertFilter") @PostMapping("/sale/info/insertFilter")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) {
CompanyEntity companyEntity = companyService.findCompany(udiInfoExportRequest.getCustomerId() + ""); CompanyEntity companyEntity = companyService.findCompany(udiInfoExportRequest.getCustomerId() + "");
if (companyEntity.getUnitIdFk().equals("110")) { if (companyEntity.getUnitIdFk().equals("110")) {
@ -244,6 +248,7 @@ public class UdiRlSupController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sale/info/updateCompanyProductRelevance") @PostMapping("/sale/info/updateCompanyProductRelevance")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateCompanyProductRelevance(@RequestBody UdiRlSupEntity udiRlSupEntity) { public BaseResponse updateCompanyProductRelevance(@RequestBody UdiRlSupEntity udiRlSupEntity) {
udiRlSupEntity.setUpdateTime(new Date()); udiRlSupEntity.setUpdateTime(new Date());
int b = udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity); int b = udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity);
@ -251,6 +256,7 @@ public class UdiRlSupController extends BaseController {
} }
@PostMapping("/sale/info/deleteCompanyProductRelevance") @PostMapping("/sale/info/deleteCompanyProductRelevance")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deleteCompanyProductRelevance(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { public BaseResponse deleteCompanyProductRelevance(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) {
boolean b = udiRlSupService.deleteById(deleteCompanyFileRequest.getId()); boolean b = udiRlSupService.deleteById(deleteCompanyFileRequest.getId());
return ResultVOUtils.success("成功"); return ResultVOUtils.success("成功");

@ -3,9 +3,11 @@ package com.glxp.api.controller.inout;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.entity.inout.IoCodeLostEntity;
import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoCodeTempEntity;
@ -47,6 +49,7 @@ public class IoCodeLostController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/updateCodeLost") @PostMapping("warehouse/inout/updateCodeLost")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateCodeLost(@RequestBody @Valid IoCodeLostEntity ioCodeLostEntity, BindingResult bindingResult) { public BaseResponse updateCodeLost(@RequestBody @Valid IoCodeLostEntity ioCodeLostEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
@ -93,6 +95,7 @@ public class IoCodeTempController extends BaseController {
//手持端扫码单据上传调用接口 //手持端扫码单据上传调用接口
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/postOrders") @PostMapping("warehouse/inout/postOrders")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse postOrders(@RequestBody PostOrderRequest postOrderRequest, BindingResult bindingResult) { public BaseResponse postOrders(@RequestBody PostOrderRequest postOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -328,6 +331,7 @@ public class IoCodeTempController extends BaseController {
//前端扫码提交 //前端扫码提交
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/addOrderWeb") @PostMapping("warehouse/inout/addOrderWeb")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse addOrderWeb(@RequestBody AddOrderRequest addOrderRequest, BindingResult bindingResult) { public BaseResponse addOrderWeb(@RequestBody AddOrderRequest addOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -872,6 +876,7 @@ public class IoCodeTempController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/addCode/updateBindSup") @PostMapping("/udiwms/addCode/updateBindSup")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateBindSup(@RequestBody IoCodeTempEntity codeSaveRequest, BindingResult bindingResult) { public BaseResponse updateBindSup(@RequestBody IoCodeTempEntity codeSaveRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -927,6 +932,7 @@ public class IoCodeTempController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("warehouse/inout/deleteCodesTempById") @GetMapping("warehouse/inout/deleteCodesTempById")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deleteCodesTempById(@RequestParam("id") Integer id) { public BaseResponse deleteCodesTempById(@RequestParam("id") Integer id) {
IoCodeTempEntity codeTempEntity = codeTempService.selectById(id); IoCodeTempEntity codeTempEntity = codeTempService.selectById(id);
@ -963,6 +969,7 @@ public class IoCodeTempController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/saveTempCode") @PostMapping("warehouse/inout/saveTempCode")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse saveCode(@RequestBody IoCodeTempEntity codeTempEntity) { public BaseResponse saveCode(@RequestBody IoCodeTempEntity codeTempEntity) {
if (codeTempEntity.getCount() == null) if (codeTempEntity.getCount() == null)
codeTempEntity.setCount(1); codeTempEntity.setCount(1);

@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.InvBusUserEntity; import com.glxp.api.entity.auth.InvBusUserEntity;
@ -106,6 +108,7 @@ public class IoOrderController extends BaseController {
//新增业务-立即提交 //新增业务-立即提交
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/submitBiz") @PostMapping("warehouse/inout/submitBiz")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse submitBiz(@RequestBody AddOrderRequest addOrderRequest) { public BaseResponse submitBiz(@RequestBody AddOrderRequest addOrderRequest) {
//校验单据是否已完成 //校验单据是否已完成
@ -140,6 +143,7 @@ public class IoOrderController extends BaseController {
//新增扫码单据-立即提交 //新增扫码单据-立即提交
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/submitCodes") @PostMapping("warehouse/inout/submitCodes")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse submitCodes(@RequestBody AddOrderRequest addOrderRequest) { public BaseResponse submitCodes(@RequestBody AddOrderRequest addOrderRequest) {
//校验单据是否已完成 //校验单据是否已完成
@ -162,6 +166,7 @@ public class IoOrderController extends BaseController {
//新增业务单据,新增扫码单据,等待校验-草稿保存 //新增业务单据,新增扫码单据,等待校验-草稿保存
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/saveOrderWeb") @PostMapping("warehouse/inout/saveOrderWeb")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse saveOrderWeb(@RequestBody AddOrderRequest addOrderRequest) { public BaseResponse saveOrderWeb(@RequestBody AddOrderRequest addOrderRequest) {
IoOrderEntity orderEntity = new IoOrderEntity(); IoOrderEntity orderEntity = new IoOrderEntity();
if (StrUtil.isEmpty(addOrderRequest.getAction())) if (StrUtil.isEmpty(addOrderRequest.getAction()))
@ -191,6 +196,7 @@ public class IoOrderController extends BaseController {
//等待校验-立即提交 //等待校验-立即提交
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/submitOrderWeb") @PostMapping("warehouse/inout/submitOrderWeb")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse submitOrderWeb(@RequestBody AddOrderRequest addOrderRequest) { public BaseResponse submitOrderWeb(@RequestBody AddOrderRequest addOrderRequest) {
//校验单据是否已完成 //校验单据是否已完成
@ -239,6 +245,7 @@ public class IoOrderController extends BaseController {
//未校验单据删除 //未校验单据删除
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("udiwms/inout/order/delete") @PostMapping("udiwms/inout/order/delete")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) { public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) {
orderService.deleteByBillNo(deleteRequest.getBillNo()); orderService.deleteByBillNo(deleteRequest.getBillNo());
orderDetailBizService.deleteByOrderId(deleteRequest.getBillNo()); orderDetailBizService.deleteByOrderId(deleteRequest.getBillNo());
@ -252,6 +259,7 @@ public class IoOrderController extends BaseController {
//已验收单据删除、单据编辑删除等 //已验收单据删除、单据编辑删除等
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("udiwms/inout/order/finish/delete") @PostMapping("udiwms/inout/order/finish/delete")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deleteById(@RequestBody DeleteRequest deleteRequest) { public BaseResponse deleteById(@RequestBody DeleteRequest deleteRequest) {
List<String> delBillNos = new ArrayList<>(); List<String> delBillNos = new ArrayList<>();
if (CollUtil.isNotEmpty(deleteRequest.getBillNos())) { if (CollUtil.isNotEmpty(deleteRequest.getBillNos())) {
@ -274,6 +282,7 @@ public class IoOrderController extends BaseController {
//单据编辑,条码减一 //单据编辑,条码减一
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("udiwms/inout/code/finish/delete") @PostMapping("udiwms/inout/code/finish/delete")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deleteCodeById(@RequestBody IoCodeEntity codeEntity) { public BaseResponse deleteCodeById(@RequestBody IoCodeEntity codeEntity) {
orderService.deleteInvCode(codeEntity.getOrderId(), codeEntity.getCode()); orderService.deleteInvCode(codeEntity.getOrderId(), codeEntity.getCode());
return ResultVOUtils.success("删除成功!"); return ResultVOUtils.success("删除成功!");
@ -282,6 +291,7 @@ public class IoOrderController extends BaseController {
//已验收单据撤回 //已验收单据撤回
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/order/received/rollback") @GetMapping("/udiwms/inout/order/received/rollback")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse rollbackOrder(String billNo) { public BaseResponse rollbackOrder(String billNo) {
if (StrUtil.isBlank(billNo)) { if (StrUtil.isBlank(billNo)) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -305,6 +315,7 @@ public class IoOrderController extends BaseController {
//已校验单据撤回到等待处理 //已校验单据撤回到等待处理
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/order/unReceive/rollback") @GetMapping("/udiwms/inout/order/unReceive/rollback")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse rollUnReceivebackOrder(String billNo) { public BaseResponse rollUnReceivebackOrder(String billNo) {
if (StrUtil.isBlank(billNo)) { if (StrUtil.isBlank(billNo)) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -435,6 +446,7 @@ public class IoOrderController extends BaseController {
* @return * @return
*/ */
@PostMapping("/udiwms/inout/order/updateOrderInfo") @PostMapping("/udiwms/inout/order/updateOrderInfo")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateOrderInfo(@RequestBody OrderEditRequest orderEditRequest) { public BaseResponse updateOrderInfo(@RequestBody OrderEditRequest orderEditRequest) {
if (null == orderEditRequest || CollUtil.isEmpty(orderEditRequest.getOrderIds())) { if (null == orderEditRequest || CollUtil.isEmpty(orderEditRequest.getOrderIds())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -471,6 +483,7 @@ public class IoOrderController extends BaseController {
} }
@PostMapping("/udiwms/inout/order/updateOrderDetailBiz") @PostMapping("/udiwms/inout/order/updateOrderDetailBiz")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateOrderDetailBiz(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) { public BaseResponse updateOrderDetailBiz(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) {
if (null == ioOrderDetailBizEntity) { if (null == ioOrderDetailBizEntity) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);

@ -5,9 +5,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
@ -105,6 +107,7 @@ public class IoOrderDetailBizController extends BaseController {
//录入业务单据详情 //录入业务单据详情
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/addBizProduct") @PostMapping("/udiwms/inout/order/addBizProduct")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse addBizProduct(@RequestBody AddBizProductReqeust addBizProductReqeust) { public BaseResponse addBizProduct(@RequestBody AddBizProductReqeust addBizProductReqeust) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("vail_product_cert"); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("vail_product_cert");
boolean isVailCert = systemParamConfigEntity.getParamValue().equals("1") ? true : false; boolean isVailCert = systemParamConfigEntity.getParamValue().equals("1") ? true : false;
@ -189,6 +192,7 @@ public class IoOrderDetailBizController extends BaseController {
//修改业务单据详情 //修改业务单据详情
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/updateBizProduct") @PostMapping("/udiwms/inout/order/updateBizProduct")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateBizProduct(@RequestBody IoOrderDetailBizEntity orderDetailBizEntity) { public BaseResponse updateBizProduct(@RequestBody IoOrderDetailBizEntity orderDetailBizEntity) {
boolean isExit = orderDetailBizService.isExit(orderDetailBizEntity.getBindRlFk(), orderDetailBizEntity.getBatchNo(), orderDetailBizEntity.getId(), orderDetailBizEntity.getOrderIdFk()); boolean isExit = orderDetailBizService.isExit(orderDetailBizEntity.getBindRlFk(), orderDetailBizEntity.getBatchNo(), orderDetailBizEntity.getId(), orderDetailBizEntity.getOrderIdFk());
if (isExit) { if (isExit) {
@ -208,6 +212,7 @@ public class IoOrderDetailBizController extends BaseController {
//选入第三方单据至业务单据 //选入第三方单据至业务单据
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/addThrOrder") @PostMapping("/udiwms/inout/order/addThrOrder")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse addThrOrder(@RequestBody ThrOrderEntity thrOrderRequest) { public BaseResponse addThrOrder(@RequestBody ThrOrderEntity thrOrderRequest) {
ThrOrderEntity thrOrderEntity = thrOrderService.findById(thrOrderRequest.getId()); ThrOrderEntity thrOrderEntity = thrOrderService.findById(thrOrderRequest.getId());
@ -333,6 +338,7 @@ public class IoOrderDetailBizController extends BaseController {
//选入领用单据至业务单据 //选入领用单据至业务单据
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/addReceiveOrder") @PostMapping("/udiwms/inout/order/addReceiveOrder")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse addReceiveOrder(@RequestBody PurReceiveEntity purReceiveEntity, public BaseResponse addReceiveOrder(@RequestBody PurReceiveEntity purReceiveEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -395,6 +401,7 @@ public class IoOrderDetailBizController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/delBizProduct") @PostMapping("/udiwms/inout/order/delBizProduct")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse delBizProduct(@RequestBody DeleteRequest deleteRequest) { public BaseResponse delBizProduct(@RequestBody DeleteRequest deleteRequest) {
return orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId())) > 0 ? ResultVOUtils.success("删除成功!") : ResultVOUtils.error(500, "删除失败"); return orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId())) > 0 ? ResultVOUtils.success("删除成功!") : ResultVOUtils.error(500, "删除失败");
} }
@ -425,6 +432,7 @@ public class IoOrderDetailBizController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/biz/updateBind") @PostMapping("/udiwms/inout/biz/updateBind")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateBindSup(@RequestBody BizBindUpdateRequest bizBindUpdateRequest) { public BaseResponse updateBindSup(@RequestBody BizBindUpdateRequest bizBindUpdateRequest) {
@ -448,6 +456,7 @@ public class IoOrderDetailBizController extends BaseController {
* @return * @return
*/ */
@GetMapping("/udiwms/inout/biz/deleteById") @GetMapping("/udiwms/inout/biz/deleteById")
@Log(title = "发票管理", businessType = BusinessType.DELETE)
public BaseResponse deleteById(Integer id) { public BaseResponse deleteById(Integer id) {
return ResultVOUtils.success(ioOrderInvoiceService.deleteByInvId(id)); return ResultVOUtils.success(ioOrderInvoiceService.deleteByInvId(id));
@ -462,6 +471,7 @@ public class IoOrderDetailBizController extends BaseController {
*/ */
@PostMapping("/udiwms/inout/biz/updateById") @PostMapping("/udiwms/inout/biz/updateById")
@Log(title = "发票管理", businessType = BusinessType.UPDATE)
public BaseResponse deleteById(@RequestBody IoOrderInvoiceRequest ioOrderInvoiceRequest) { public BaseResponse deleteById(@RequestBody IoOrderInvoiceRequest ioOrderInvoiceRequest) {
return ResultVOUtils.success(ioOrderInvoiceService.updateByInvId(ioOrderInvoiceRequest)); return ResultVOUtils.success(ioOrderInvoiceService.updateByInvId(ioOrderInvoiceRequest));
@ -470,6 +480,7 @@ public class IoOrderDetailBizController extends BaseController {
@PostMapping("/udiwms/inout/biz/insertInvoice") @PostMapping("/udiwms/inout/biz/insertInvoice")
@Log(title = "发票管理", businessType = BusinessType.INSERT)
public BaseResponse insertInvoice(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) { public BaseResponse insertInvoice(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) {
IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity(); IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();

@ -5,9 +5,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
@ -109,6 +111,7 @@ public class IoOrderReviewController extends BaseController {
//前端二次审核 //前端二次审核
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/inout/order/web/updateStatus") @PostMapping("/spms/inout/order/web/updateStatus")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse webUpdateStatus(@RequestBody ReviewFinishRequest updateExportStatusRequest, public BaseResponse webUpdateStatus(@RequestBody ReviewFinishRequest updateExportStatusRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -133,6 +136,7 @@ public class IoOrderReviewController extends BaseController {
//前端第三次验收 //前端第三次验收
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/inout/order/third/updateStatus") @PostMapping("/spms/inout/order/third/updateStatus")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse thirdUpdateStatus(@RequestBody ReviewFinishRequest updateExportStatusRequest, public BaseResponse thirdUpdateStatus(@RequestBody ReviewFinishRequest updateExportStatusRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -221,6 +225,7 @@ public class IoOrderReviewController extends BaseController {
//手持终端验收完成后,更新订单状态 //手持终端验收完成后,更新订单状态
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/inout/order/check/updateStatus") @PostMapping("/spms/inout/order/check/updateStatus")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest, public BaseResponse updateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
AuthAdmin authAdmin = null; AuthAdmin authAdmin = null;

@ -3,8 +3,10 @@ package com.glxp.api.controller.inout;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiProductEntity;
import com.glxp.api.entity.inout.IoCodeRelEntity; import com.glxp.api.entity.inout.IoCodeRelEntity;
@ -65,6 +67,7 @@ public class ioCodeRelController {
} }
@GetMapping("/udi/ioCode/Rel/checkLowProduct") @GetMapping("/udi/ioCode/Rel/checkLowProduct")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse checkLowProduct(String upCode,String lowCode) { public BaseResponse checkLowProduct(String upCode,String lowCode) {
UdiProductEntity udiProductEntity=new UdiProductEntity(); UdiProductEntity udiProductEntity=new UdiProductEntity();
@ -127,6 +130,7 @@ public class ioCodeRelController {
@GetMapping("/udi/ioCode/Rel/del") @GetMapping("/udi/ioCode/Rel/del")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse del(String code,String parentCode) { public BaseResponse del(String code,String parentCode) {
int count=ioCodeRelServicec.delIoCodeRel(code,parentCode); int count=ioCodeRelServicec.delIoCodeRel(code,parentCode);

@ -3,9 +3,11 @@ package com.glxp.api.controller.inv;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inv.DeviceMAOrderEntity; import com.glxp.api.entity.inv.DeviceMAOrderEntity;
import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity;
@ -73,6 +75,7 @@ public class DeviceMAOrderController {
* @return * @return
*/ */
@PostMapping("/device/MA/order/addMAOrder") @PostMapping("/device/MA/order/addMAOrder")
@Log(title = "设备养护", businessType = BusinessType.INSERT)
public BaseResponse addMAOrder(@RequestBody DeviceMAOrderEntity deviceMAOrderEntity, BindingResult bindingResult) { public BaseResponse addMAOrder(@RequestBody DeviceMAOrderEntity deviceMAOrderEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -88,6 +91,7 @@ public class DeviceMAOrderController {
* @return * @return
*/ */
@PostMapping("/device/MA/order/updateMAOrder") @PostMapping("/device/MA/order/updateMAOrder")
@Log(title = "设备养护", businessType = BusinessType.UPDATE)
public BaseResponse updateMAOrder(@RequestBody DeviceMAOrderEntity deviceMAOrderEntity, BindingResult bindingResult) { public BaseResponse updateMAOrder(@RequestBody DeviceMAOrderEntity deviceMAOrderEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -103,6 +107,7 @@ public class DeviceMAOrderController {
* @return * @return
*/ */
@PostMapping("/device/MA/order/deleteMAOrder") @PostMapping("/device/MA/order/deleteMAOrder")
@Log(title = "设备养护", businessType = BusinessType.DELETE)
public BaseResponse deleteMAOrder(@RequestBody FilterDeviceMAOrderRequest filterDeviceMAOrderRequest, BindingResult bindingResult) { public BaseResponse deleteMAOrder(@RequestBody FilterDeviceMAOrderRequest filterDeviceMAOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -121,6 +126,7 @@ public class DeviceMAOrderController {
* @return * @return
*/ */
@PostMapping("/device/MA/order/addDeviceMAOrder") @PostMapping("/device/MA/order/addDeviceMAOrder")
@Log(title = "设备养护", businessType = BusinessType.INSERT)
public BaseResponse addDeviceMAOrder(@RequestBody AddDeviceMAOrderRequest addDeviceMAOrderRequest, BindingResult bindingResult) { public BaseResponse addDeviceMAOrder(@RequestBody AddDeviceMAOrderRequest addDeviceMAOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -2,9 +2,11 @@ package com.glxp.api.controller.inv;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inv.DeviceMAOrderDetailEntity; import com.glxp.api.entity.inv.DeviceMAOrderDetailEntity;
import com.glxp.api.req.inv.FilterDeviceMAOrderDetailRequest; import com.glxp.api.req.inv.FilterDeviceMAOrderDetailRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
@ -23,7 +25,7 @@ import java.util.List;
* *
*/ */
@RestController @RestController
public class DeviceMAOrderDetailCotroller { public class DeviceMAOrderDetailCotroller {
@Resource @Resource
private DeviceMAOrderDetailService deviceMAOrderDetailService; private DeviceMAOrderDetailService deviceMAOrderDetailService;
@ -52,6 +54,7 @@ public class DeviceMAOrderDetailCotroller {
* @return * @return
*/ */
@PostMapping("/device/MA/order/detail/addOrderDetail") @PostMapping("/device/MA/order/detail/addOrderDetail")
@Log(title = "设备养护", businessType = BusinessType.INSERT)
public BaseResponse addOrderDetail(@RequestBody DeviceMAOrderDetailEntity detailEntity, BindingResult bindingResult) { public BaseResponse addOrderDetail(@RequestBody DeviceMAOrderDetailEntity detailEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -67,6 +70,7 @@ public class DeviceMAOrderDetailCotroller {
* @return * @return
*/ */
@PostMapping("/device/MA/order/detail/updateOrderDetail") @PostMapping("/device/MA/order/detail/updateOrderDetail")
@Log(title = "设备养护", businessType = BusinessType.UPDATE)
public BaseResponse updateOrderDetail(@RequestBody DeviceMAOrderDetailEntity detailEntity, BindingResult bindingResult) { public BaseResponse updateOrderDetail(@RequestBody DeviceMAOrderDetailEntity detailEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -82,6 +86,7 @@ public class DeviceMAOrderDetailCotroller {
* @return * @return
*/ */
@PostMapping("/device/MA/order/detail/deleteOrderDetail") @PostMapping("/device/MA/order/detail/deleteOrderDetail")
@Log(title = "设备养护", businessType = BusinessType.DELETE)
public BaseResponse deleteOrderDetail(@RequestBody DeviceMAOrderDetailEntity detailEntity, BindingResult bindingResult) { public BaseResponse deleteOrderDetail(@RequestBody DeviceMAOrderDetailEntity detailEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -2,9 +2,11 @@ package com.glxp.api.controller.inv;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity; import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity;
import com.glxp.api.req.inv.AddDeviceReceiveOrderDetailRequest; import com.glxp.api.req.inv.AddDeviceReceiveOrderDetailRequest;
import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest; import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest;
@ -65,6 +67,7 @@ public class DeviceReceiveDetailController {
* @return * @return
*/ */
@PostMapping("/device/receive/order/detail/addOrderDetail") @PostMapping("/device/receive/order/detail/addOrderDetail")
@Log(title = "设备领用", businessType = BusinessType.INSERT)
public BaseResponse addOrderDetail(@RequestBody AddDeviceReceiveOrderDetailRequest addDetailRequest, BindingResult bindingResult) { public BaseResponse addOrderDetail(@RequestBody AddDeviceReceiveOrderDetailRequest addDetailRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -83,6 +86,7 @@ public class DeviceReceiveDetailController {
* @return * @return
*/ */
@PostMapping("/device/receive/order/detail/updateOrderDetail") @PostMapping("/device/receive/order/detail/updateOrderDetail")
@Log(title = "设备领用", businessType = BusinessType.UPDATE)
public BaseResponse updateOrderDetail(@RequestBody DeviceReceiveOrderDetailEntity detailEntity, BindingResult bindingResult) { public BaseResponse updateOrderDetail(@RequestBody DeviceReceiveOrderDetailEntity detailEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -101,6 +105,7 @@ public class DeviceReceiveDetailController {
* @return * @return
*/ */
@PostMapping("/device/receive/order/detail/deleteOrderDetail") @PostMapping("/device/receive/order/detail/deleteOrderDetail")
@Log(title = "设备领用", businessType = BusinessType.DELETE)
public BaseResponse deleteOrderDetail(@RequestBody FilterDeviceReceiveOrderDetailRequest detailRequest, BindingResult bindingResult) { public BaseResponse deleteOrderDetail(@RequestBody FilterDeviceReceiveOrderDetailRequest detailRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -1,9 +1,11 @@
package com.glxp.api.controller.inv; package com.glxp.api.controller.inv;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inv.DeviceReceiveOrderEntity; import com.glxp.api.entity.inv.DeviceReceiveOrderEntity;
import com.glxp.api.req.inv.FilterDeviceReceiveOrderRequest; import com.glxp.api.req.inv.FilterDeviceReceiveOrderRequest;
import com.glxp.api.res.inv.DeviceReceiveOrderResponse; import com.glxp.api.res.inv.DeviceReceiveOrderResponse;
@ -47,6 +49,7 @@ public class DeviceReceiveOrderController {
* @param deviceReceiveOrderEntity * @param deviceReceiveOrderEntity
*/ */
@PostMapping("/device/receive/order/addOrder") @PostMapping("/device/receive/order/addOrder")
@Log(title = "设备领用", businessType = BusinessType.INSERT)
public BaseResponse addOrder(@RequestBody DeviceReceiveOrderEntity deviceReceiveOrderEntity, BindingResult bindingResult) { public BaseResponse addOrder(@RequestBody DeviceReceiveOrderEntity deviceReceiveOrderEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors() || null == deviceReceiveOrderEntity) { if (bindingResult.hasErrors() || null == deviceReceiveOrderEntity) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -62,6 +65,7 @@ public class DeviceReceiveOrderController {
* @return * @return
*/ */
@PostMapping("/device/receive/order/update") @PostMapping("/device/receive/order/update")
@Log(title = "设备领用", businessType = BusinessType.UPDATE)
public BaseResponse update(@RequestBody DeviceReceiveOrderEntity deviceReceiveOrderEntity, BindingResult bindingResult) { public BaseResponse update(@RequestBody DeviceReceiveOrderEntity deviceReceiveOrderEntity, BindingResult bindingResult) {
Integer integer = deviceReceiveOrderService.selectOrderIdByOrderId(deviceReceiveOrderEntity.getOrderId()); Integer integer = deviceReceiveOrderService.selectOrderIdByOrderId(deviceReceiveOrderEntity.getOrderId());
deviceReceiveOrderEntity.setId(integer); deviceReceiveOrderEntity.setId(integer);
@ -83,6 +87,7 @@ public class DeviceReceiveOrderController {
* @return * @return
*/ */
@PostMapping("/device/receive/order/submitAudit") @PostMapping("/device/receive/order/submitAudit")
@Log(title = "设备领用", businessType = BusinessType.UPDATE)
public BaseResponse submitAudit(@RequestBody FilterDeviceReceiveOrderRequest deviceReceiveOrderRequest, BindingResult bindingResult) { public BaseResponse submitAudit(@RequestBody FilterDeviceReceiveOrderRequest deviceReceiveOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -101,6 +106,7 @@ public class DeviceReceiveOrderController {
* @return * @return
*/ */
@PostMapping("/device/receive/order/updateStatus") @PostMapping("/device/receive/order/updateStatus")
@Log(title = "设备领用", businessType = BusinessType.UPDATE)
public BaseResponse updateStatus(@RequestBody FilterDeviceReceiveOrderRequest filterDeviceReceiveOrderRequest, BindingResult bindingResult) { public BaseResponse updateStatus(@RequestBody FilterDeviceReceiveOrderRequest filterDeviceReceiveOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -119,6 +125,7 @@ public class DeviceReceiveOrderController {
* @return * @return
*/ */
@PostMapping("/device/receive/order/delete") @PostMapping("/device/receive/order/delete")
@Log(title = "设备领用", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody FilterDeviceReceiveOrderRequest filterDeviceReceiveOrderRequest, BindingResult bindingResult) { public BaseResponse delete(@RequestBody FilterDeviceReceiveOrderRequest filterDeviceReceiveOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);

@ -3,9 +3,11 @@ package com.glxp.api.controller.inv;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.annotation.RepeatSubmit;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.entity.inv.InnerOrderDetailEntity; import com.glxp.api.entity.inv.InnerOrderDetailEntity;
import com.glxp.api.entity.inv.InnerOrderEntity; import com.glxp.api.entity.inv.InnerOrderEntity;
@ -57,6 +59,7 @@ public class InnerOrderController {
@RepeatSubmit() @RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/postOrder") @PostMapping("/postOrder")
@Log(title = "内部码", businessType = BusinessType.INSERT)
public BaseResponse postOrder(@RequestBody PostInnerOrderRequest postInnerOrderRequest) { public BaseResponse postOrder(@RequestBody PostInnerOrderRequest postInnerOrderRequest) {
long userId = customerService.getUserId(); long userId = customerService.getUserId();
@ -100,6 +103,7 @@ public class InnerOrderController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
@Log(title = "内部码", businessType = BusinessType.INSERT)
public BaseResponse add(@RequestBody InnerOrderEntity innerOrderEntity) { public BaseResponse add(@RequestBody InnerOrderEntity innerOrderEntity) {
innerOrderService.insert(innerOrderEntity); innerOrderService.insert(innerOrderEntity);
@ -111,6 +115,7 @@ public class InnerOrderController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
@Log(title = "内部码", businessType = BusinessType.UPDATE)
public BaseResponse edit(@RequestBody InnerOrderEntity innerOrderEntity) { public BaseResponse edit(@RequestBody InnerOrderEntity innerOrderEntity) {
innerOrderService.update(innerOrderEntity); innerOrderService.update(innerOrderEntity);
return ResultVOUtils.success("删除成功"); return ResultVOUtils.success("删除成功");
@ -122,6 +127,7 @@ public class InnerOrderController {
* @param ids * @param ids
*/ */
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
@Log(title = "内部码", businessType = BusinessType.DELETE)
public BaseResponse remove(@NotEmpty(message = "主键不能为空") public BaseResponse remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) { @PathVariable String[] ids) {
List<String> idArray = Arrays.asList(ids); List<String> idArray = Arrays.asList(ids);
@ -158,6 +164,7 @@ public class InnerOrderController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/insertDetail") @PostMapping("/insertDetail")
@Log(title = "内部码", businessType = BusinessType.INSERT)
public BaseResponse detailAdd(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) { public BaseResponse detailAdd(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) {
innerOrderDetailService.insert(innerOrderDetailEntity); innerOrderDetailService.insert(innerOrderDetailEntity);
@ -169,6 +176,7 @@ public class InnerOrderController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/updateDetail") @PostMapping("/updateDetail")
@Log(title = "内部码", businessType = BusinessType.UPDATE)
public BaseResponse detailEdit(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) { public BaseResponse detailEdit(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) {
innerOrderDetailService.update(innerOrderDetailEntity); innerOrderDetailService.update(innerOrderDetailEntity);
return ResultVOUtils.success("更新成功"); return ResultVOUtils.success("更新成功");
@ -180,6 +188,7 @@ public class InnerOrderController {
* @param ids * @param ids
*/ */
@DeleteMapping("/detail/{ids}") @DeleteMapping("/detail/{ids}")
@Log(title = "内部码", businessType = BusinessType.DELETE)
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {

@ -2,9 +2,11 @@ package com.glxp.api.controller.inv;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inv.InvCountCodesEntity; import com.glxp.api.entity.inv.InvCountCodesEntity;
import com.glxp.api.req.inv.FilterInvCountCodesRequest; import com.glxp.api.req.inv.FilterInvCountCodesRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
@ -49,6 +51,7 @@ public class InvCountCodesController {
* @return * @return
*/ */
@PostMapping("/inv/count/codes/deleteCode") @PostMapping("/inv/count/codes/deleteCode")
@Log(title = "盘点单据", businessType = BusinessType.DELETE)
public BaseResponse deleteCode(@RequestBody FilterInvCountCodesRequest codesRequest) { public BaseResponse deleteCode(@RequestBody FilterInvCountCodesRequest codesRequest) {
if (null == codesRequest || StrUtil.isBlank(codesRequest.getOrderIdFk()) || StrUtil.isBlank(codesRequest.getRelId()) || StrUtil.isBlank(codesRequest.getCode())) { if (null == codesRequest || StrUtil.isBlank(codesRequest.getOrderIdFk()) || StrUtil.isBlank(codesRequest.getRelId()) || StrUtil.isBlank(codesRequest.getCode())) {
return ResultVOUtils.success(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.success(ResultEnum.PARAM_VERIFY_FALL);
@ -63,6 +66,7 @@ public class InvCountCodesController {
* @return * @return
*/ */
@PostMapping("/inv/count/codes/addCode") @PostMapping("/inv/count/codes/addCode")
@Log(title = "盘点单据", businessType = BusinessType.INSERT)
public BaseResponse addCode(@RequestBody InvCountCodesEntity invCountCodes) { public BaseResponse addCode(@RequestBody InvCountCodesEntity invCountCodes) {
if (null == invCountCodes || StrUtil.isBlank(invCountCodes.getCode())) { if (null == invCountCodes || StrUtil.isBlank(invCountCodes.getCode())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);

@ -4,9 +4,11 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inv.InvCountOrderEntity; import com.glxp.api.entity.inv.InvCountOrderEntity;
import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity;
@ -75,6 +77,7 @@ public class InvCountOrderController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/inv/count/order/delete") @PostMapping("/inv/count/order/delete")
@Log(title = "盘点单据", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
invCountOrderService.deleteOrder(deleteRequest.getId()); invCountOrderService.deleteOrder(deleteRequest.getId());
return ResultVOUtils.success(); return ResultVOUtils.success();
@ -87,6 +90,7 @@ public class InvCountOrderController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/inv/count/order/saveCountOrder") @PostMapping("/inv/count/order/saveCountOrder")
@Log(title = "盘点单据", businessType = BusinessType.INSERT)
public BaseResponse saveCountOrder(@RequestBody InvCountOrderEntity invCountOrder, BindingResult bindingResult) { public BaseResponse saveCountOrder(@RequestBody InvCountOrderEntity invCountOrder, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -106,6 +110,7 @@ public class InvCountOrderController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/inv/count/order/submitAudit") @GetMapping("/inv/count/order/submitAudit")
@Log(title = "盘点单据", businessType = BusinessType.UPDATE)
public BaseResponse submitAudit(String id) { public BaseResponse submitAudit(String id) {
if (StrUtil.isBlank(id)) { if (StrUtil.isBlank(id)) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -121,6 +126,7 @@ public class InvCountOrderController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/inv/count/order/updateCountOrderStatus") @PostMapping("/inv/count/order/updateCountOrderStatus")
@Log(title = "盘点单据", businessType = BusinessType.UPDATE)
public BaseResponse updateCountOrderStatus(@RequestBody FilterInvCountOrderRequest filterInvCountOrderRequest) { public BaseResponse updateCountOrderStatus(@RequestBody FilterInvCountOrderRequest filterInvCountOrderRequest) {
if (null == filterInvCountOrderRequest || StrUtil.isBlank(filterInvCountOrderRequest.getId()) || null == filterInvCountOrderRequest.getStatus()) { if (null == filterInvCountOrderRequest || StrUtil.isBlank(filterInvCountOrderRequest.getId()) || null == filterInvCountOrderRequest.getStatus()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -184,6 +190,7 @@ public class InvCountOrderController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/invCount/order/saveCountOrderForPDA") @PostMapping("/invCount/order/saveCountOrderForPDA")
@Log(title = "盘点单据", businessType = BusinessType.INSERT)
public BaseResponse saveCountOrderForPDA(@RequestBody @Valid AddInvCountOrderSaveRequest addInvCountOrderSaveRequest, BindingResult bindingResult) { public BaseResponse saveCountOrderForPDA(@RequestBody @Valid AddInvCountOrderSaveRequest addInvCountOrderSaveRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -2,9 +2,11 @@ package com.glxp.api.controller.inv;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inv.InvCountOrderDetailEntity; import com.glxp.api.entity.inv.InvCountOrderDetailEntity;
import com.glxp.api.req.inv.FilterInvCountOrderDetailRequest; import com.glxp.api.req.inv.FilterInvCountOrderDetailRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
@ -51,6 +53,7 @@ public class InvCountOrderDetailController {
* @return * @return
*/ */
@PostMapping("/inv/count/order/detail/deleteOrderDetail") @PostMapping("/inv/count/order/detail/deleteOrderDetail")
@Log(title = "盘点单据", businessType = BusinessType.DELETE)
public BaseResponse deleteOrderDetail(@RequestBody FilterInvCountOrderDetailRequest detailRequest) { public BaseResponse deleteOrderDetail(@RequestBody FilterInvCountOrderDetailRequest detailRequest) {
if (null == detailRequest || null == detailRequest.getId()) { if (null == detailRequest || null == detailRequest.getId()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -65,6 +68,7 @@ public class InvCountOrderDetailController {
* @return * @return
*/ */
@PostMapping("/inv/count/order/detail/addCountOrderDetail") @PostMapping("/inv/count/order/detail/addCountOrderDetail")
@Log(title = "产品详情", businessType = BusinessType.INSERT)
public BaseResponse addCountOrderDetail(@RequestBody InvCountOrderDetailEntity invCountOrderDetail) { public BaseResponse addCountOrderDetail(@RequestBody InvCountOrderDetailEntity invCountOrderDetail) {
if (null == invCountOrderDetail || StrUtil.isBlank(invCountOrderDetail.getOrderIdFk()) || null == invCountOrderDetail.getRelId()) { if (null == invCountOrderDetail || StrUtil.isBlank(invCountOrderDetail.getOrderIdFk()) || null == invCountOrderDetail.getRelId()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);

@ -2,9 +2,11 @@ package com.glxp.api.controller.inv;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.inv.InvInnerOrderPrintEntity; import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
@ -68,6 +70,7 @@ public class InvInnerOrderPrintController {
} }
@PostMapping("/udiwms/innerOrderPrint/addOrderPrint") @PostMapping("/udiwms/innerOrderPrint/addOrderPrint")
@Log(title = "内部码", businessType = BusinessType.INSERT)
public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) { public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) {
if (invInnerOrderprintReques.getOrderIdFk() != null) { if (invInnerOrderprintReques.getOrderIdFk() != null) {

@ -2,9 +2,11 @@ package com.glxp.api.controller.inv;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inv.InvMAOrderEntity; import com.glxp.api.entity.inv.InvMAOrderEntity;
import com.glxp.api.req.inv.FilterInvMAOrderRequest; import com.glxp.api.req.inv.FilterInvMAOrderRequest;
import com.glxp.api.res.inv.InvMAOrderResponse; import com.glxp.api.res.inv.InvMAOrderResponse;
@ -50,6 +52,7 @@ public class InvMAOrderController {
* @return * @return
*/ */
@PostMapping("/inv/MA/order/addOrder") @PostMapping("/inv/MA/order/addOrder")
@Log(title = "库存养护记录", businessType = BusinessType.INSERT)
public BaseResponse addOrder(@RequestBody InvMAOrderEntity invMAOrderEntity, BindingResult bindingResult) { public BaseResponse addOrder(@RequestBody InvMAOrderEntity invMAOrderEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -65,6 +68,7 @@ public class InvMAOrderController {
* @return * @return
*/ */
@PostMapping("/inv/MA/order/update") @PostMapping("/inv/MA/order/update")
@Log(title = "库存养护记录", businessType = BusinessType.UPDATE)
public BaseResponse update(@RequestBody InvMAOrderEntity invMAOrderEntity, BindingResult bindingResult) { public BaseResponse update(@RequestBody InvMAOrderEntity invMAOrderEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -99,6 +103,7 @@ public class InvMAOrderController {
* @return * @return
*/ */
@PostMapping("/inv/MA/order/updateStatus") @PostMapping("/inv/MA/order/updateStatus")
@Log(title = "库存养护记录", businessType = BusinessType.UPDATE)
public BaseResponse updateStatus(@RequestBody FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) { public BaseResponse updateStatus(@RequestBody FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -117,6 +122,7 @@ public class InvMAOrderController {
* @return * @return
*/ */
@PostMapping("/inv/MA/order/delete") @PostMapping("/inv/MA/order/delete")
@Log(title = "库存养护记录", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) { public BaseResponse delete(@RequestBody FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -3,9 +3,11 @@ package com.glxp.api.controller.inv;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inv.InvMAOrderDetailEntity; import com.glxp.api.entity.inv.InvMAOrderDetailEntity;
import com.glxp.api.req.inv.AddInvMAOrderDetailRequest; import com.glxp.api.req.inv.AddInvMAOrderDetailRequest;
import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest; import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest;
@ -86,6 +88,7 @@ public class InvMAOrderDetailController {
* @return * @return
*/ */
@PostMapping("/inv/MA/order/detail/delete") @PostMapping("/inv/MA/order/detail/delete")
@Log(title = "库存养护记录", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody FilterInvMAOrderDetailRequest filterInvMAOrderDetailRequest, BindingResult bindingResult) { public BaseResponse delete(@RequestBody FilterInvMAOrderDetailRequest filterInvMAOrderDetailRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -103,6 +106,7 @@ public class InvMAOrderDetailController {
* @return * @return
*/ */
@PostMapping("/inv/MA/order/detail/update") @PostMapping("/inv/MA/order/detail/update")
@Log(title = "库存养护记录", businessType = BusinessType.UPDATE)
public BaseResponse update(@RequestBody InvMAOrderDetailEntity invMAOrderDetailEntity, BindingResult bindingResult) { public BaseResponse update(@RequestBody InvMAOrderDetailEntity invMAOrderDetailEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -4,9 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inv.InvPreProductDetailEntity; import com.glxp.api.entity.inv.InvPreProductDetailEntity;
import com.glxp.api.entity.inv.InvPreProductEntity; import com.glxp.api.entity.inv.InvPreProductEntity;
import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
@ -113,6 +115,7 @@ public class InvPreProductController {
* @return * @return
*/ */
@PostMapping("/spms/inv/pre/product/delete") @PostMapping("/spms/inv/pre/product/delete")
@Log(title = "寄售库存", businessType = BusinessType.DELETE)
public BaseResponse deleteInvPreProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteInvPreProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -3,8 +3,10 @@ package com.glxp.api.controller.inv;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoCodeTempEntity;
@ -63,6 +65,7 @@ public class InvPreinOrderController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("udiwms/inv/prein/delete") @PostMapping("udiwms/inv/prein/delete")
@Log(title = "预验收单据", businessType = BusinessType.DELETE)
public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) { public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) {
if (StrUtil.isEmpty(deleteRequest.getBillNo())) if (StrUtil.isEmpty(deleteRequest.getBillNo()))

@ -5,9 +5,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.entity.inv.InvProductDetailEntity;
import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.entity.inv.InvProductEntity;
@ -167,6 +169,7 @@ public class InvProductController extends BaseController {
* @return * @return
*/ */
@PostMapping("/spms/inv/product/delete") @PostMapping("/spms/inv/product/delete")
@Log(title = "库存查询", businessType = BusinessType.DELETE)
public BaseResponse deleteInvProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteInvProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -1,8 +1,10 @@
package com.glxp.api.controller.inv; package com.glxp.api.controller.inv;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.req.inv.FilterInvRemindMsgRequest; import com.glxp.api.req.inv.FilterInvRemindMsgRequest;
import com.glxp.api.res.inv.InvRemindMsgResponse; import com.glxp.api.res.inv.InvRemindMsgResponse;
@ -50,6 +52,7 @@ public class InvRemindMsgController extends BaseController {
* @return * @return
*/ */
@GetMapping("/udiwms/inv/remind/msg/confirmMsg") @GetMapping("/udiwms/inv/remind/msg/confirmMsg")
@Log(title = "库存预警", businessType = BusinessType.UPDATE)
public BaseResponse confirmMsg(Integer id, String handleMsg) { public BaseResponse confirmMsg(Integer id, String handleMsg) {
return invRemindMsgService.confirmMsg(id, handleMsg); return invRemindMsgService.confirmMsg(id, handleMsg);
} }
@ -62,6 +65,7 @@ public class InvRemindMsgController extends BaseController {
* @return * @return
*/ */
@GetMapping("/udiwms/inv/remind/msg/ignoreMsg") @GetMapping("/udiwms/inv/remind/msg/ignoreMsg")
@Log(title = "库存预警", businessType = BusinessType.UPDATE)
public BaseResponse ignoreMsg(Integer id, Integer ignoreStatus) { public BaseResponse ignoreMsg(Integer id, Integer ignoreStatus) {
return invRemindMsgService.ignoreMsg(id, ignoreStatus); return invRemindMsgService.ignoreMsg(id, ignoreStatus);
} }

@ -3,9 +3,11 @@ package com.glxp.api.controller.inv;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inv.InvRemindSetEntity; import com.glxp.api.entity.inv.InvRemindSetEntity;
import com.glxp.api.req.inv.AddInvRemindSetRequest; import com.glxp.api.req.inv.AddInvRemindSetRequest;
import com.glxp.api.req.inv.FilterInvRemindSetRequest; import com.glxp.api.req.inv.FilterInvRemindSetRequest;
@ -48,6 +50,7 @@ public class InvRemindSetController {
* @return * @return
*/ */
@PostMapping("/udiwms/inv/remind/set/add") @PostMapping("/udiwms/inv/remind/set/add")
@Log(title = "库存预警", businessType = BusinessType.INSERT)
public BaseResponse addInvRemindSet(@RequestBody AddInvRemindSetRequest addInvRemindSetRequest) { public BaseResponse addInvRemindSet(@RequestBody AddInvRemindSetRequest addInvRemindSetRequest) {
return invRemindSetService.addInvRemindSet(addInvRemindSetRequest); return invRemindSetService.addInvRemindSet(addInvRemindSetRequest);
} }
@ -59,6 +62,7 @@ public class InvRemindSetController {
* @return * @return
*/ */
@PostMapping("/udiwms/inv/remind/set/batchAddInvRemindSet") @PostMapping("/udiwms/inv/remind/set/batchAddInvRemindSet")
@Log(title = "库存预警", businessType = BusinessType.INSERT)
public BaseResponse batchAddInvRemindSet(@RequestBody AddInvRemindSetRequest addInvRemindSetRequest) { public BaseResponse batchAddInvRemindSet(@RequestBody AddInvRemindSetRequest addInvRemindSetRequest) {
if (null == addInvRemindSetRequest || CollUtil.isEmpty(addInvRemindSetRequest.getRelIdList())) { if (null == addInvRemindSetRequest || CollUtil.isEmpty(addInvRemindSetRequest.getRelIdList())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -73,6 +77,7 @@ public class InvRemindSetController {
* @return * @return
*/ */
@PostMapping("/udiwms/inv/remind/set/update") @PostMapping("/udiwms/inv/remind/set/update")
@Log(title = "库存预警", businessType = BusinessType.UPDATE)
public BaseResponse updateInvRemindSet(@RequestBody InvRemindSetEntity invRemindSetEntity) { public BaseResponse updateInvRemindSet(@RequestBody InvRemindSetEntity invRemindSetEntity) {
return invRemindSetService.updateInvRemindSet(invRemindSetEntity); return invRemindSetService.updateInvRemindSet(invRemindSetEntity);
} }
@ -84,6 +89,7 @@ public class InvRemindSetController {
* @return * @return
*/ */
@PostMapping("/udiwms/inv/remind/set/delete") @PostMapping("/udiwms/inv/remind/set/delete")
@Log(title = "库存预警", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
if (null == deleteRequest || StrUtil.isBlank(deleteRequest.getId())) { if (null == deleteRequest || StrUtil.isBlank(deleteRequest.getId())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);

@ -25,7 +25,7 @@ import java.util.List;
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/monitor/logininfor") @RequestMapping("/monitor/logininfor")
public class SysLogininforController extends BaseController { public class SysLogininforController extends BaseController {
private final ISysLogininforService logininforService; private final ISysLogininforService logininforService;

@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.annotation.RepeatSubmit;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.purchase.PurApplyDetailEntity; import com.glxp.api.entity.purchase.PurApplyDetailEntity;
@ -78,6 +80,7 @@ public class PurApplyController {
@RepeatSubmit() @RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/apply/postOrder") @PostMapping("/purchase/apply/postOrder")
@Log(title = "申购单", businessType = BusinessType.INSERT)
public BaseResponse postOrder(@RequestBody PostPurApplyRequest postPurApplyRequest) { public BaseResponse postOrder(@RequestBody PostPurApplyRequest postPurApplyRequest) {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
@ -147,6 +150,7 @@ public class PurApplyController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/apply/auditOrder") @PostMapping("/purchase/apply/auditOrder")
@Log(title = "审核申购单", businessType = BusinessType.INSERT)
public BaseResponse auditOrder(@RequestBody PurApplyResponse purApplyRequest) { public BaseResponse auditOrder(@RequestBody PurApplyResponse purApplyRequest) {
@ -201,6 +205,7 @@ public class PurApplyController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/apply") @PostMapping("/purchase/apply")
@Log(title = "申购单", businessType = BusinessType.INSERT)
public BaseResponse add(@RequestBody PurApplyEntity purApplyRequest) { public BaseResponse add(@RequestBody PurApplyEntity purApplyRequest) {
purApplyService.insert(purApplyRequest); purApplyService.insert(purApplyRequest);
@ -212,6 +217,7 @@ public class PurApplyController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PutMapping("/purchase/apply") @PutMapping("/purchase/apply")
@Log(title = "申购单", businessType = BusinessType.UPDATE)
public BaseResponse edit(@RequestBody PurApplyEntity purApplyRequest) { public BaseResponse edit(@RequestBody PurApplyEntity purApplyRequest) {
purApplyService.update(purApplyRequest); purApplyService.update(purApplyRequest);
return ResultVOUtils.success("删除成功"); return ResultVOUtils.success("删除成功");
@ -223,6 +229,7 @@ public class PurApplyController {
* @param ids * @param ids
*/ */
@DeleteMapping("/purchase/apply/{ids}") @DeleteMapping("/purchase/apply/{ids}")
@Log(title = "申购单", businessType = BusinessType.DELETE)
public BaseResponse remove(@NotEmpty(message = "主键不能为空") public BaseResponse remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {
List<Long> idArray = Arrays.asList(ids); List<Long> idArray = Arrays.asList(ids);
@ -259,6 +266,7 @@ public class PurApplyController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/apply/detail") @PostMapping("/purchase/apply/detail")
@Log(title = "申购单", businessType = BusinessType.INSERT)
public BaseResponse detailAdd(@RequestBody PurApplyDetailEntity purApplyDetailEntity) { public BaseResponse detailAdd(@RequestBody PurApplyDetailEntity purApplyDetailEntity) {
purApplyDetailService.insert(purApplyDetailEntity); purApplyDetailService.insert(purApplyDetailEntity);
@ -270,6 +278,7 @@ public class PurApplyController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/apply/updateDetail") @PostMapping("/purchase/apply/updateDetail")
@Log(title = "申购单", businessType = BusinessType.UPDATE)
public BaseResponse detailEdit(@RequestBody PurApplyDetailEntity purApplyDetailRequest) { public BaseResponse detailEdit(@RequestBody PurApplyDetailEntity purApplyDetailRequest) {
purApplyDetailService.update(purApplyDetailRequest); purApplyDetailService.update(purApplyDetailRequest);
return ResultVOUtils.success("修改成功"); return ResultVOUtils.success("修改成功");
@ -281,6 +290,7 @@ public class PurApplyController {
* @param ids * @param ids
*/ */
@DeleteMapping("/purchase/apply/detail/{ids}") @DeleteMapping("/purchase/apply/detail/{ids}")
@Log(title = "申购单", businessType = BusinessType.DELETE)
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {
@ -294,6 +304,7 @@ public class PurApplyController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/apply/addDetail") @PostMapping("/purchase/apply/addDetail")
@Log(title = "申购单", businessType = BusinessType.INSERT)
public BaseResponse addDetail(@RequestBody PurApplyDetailEntity purApplyDetailEntity) { public BaseResponse addDetail(@RequestBody PurApplyDetailEntity purApplyDetailEntity) {
purApplyDetailService.insert(purApplyDetailEntity); purApplyDetailService.insert(purApplyDetailEntity);
@ -304,6 +315,7 @@ public class PurApplyController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/apply/add") @PostMapping("/purchase/apply/add")
@Log(title = "申购单", businessType = BusinessType.INSERT)
public BaseResponse add() { public BaseResponse add() {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
@ -323,6 +335,7 @@ public class PurApplyController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/apply/delApplyDetailAll") @PostMapping("/purchase/apply/delApplyDetailAll")
@Log(title = "申购单", businessType = BusinessType.DELETE)
public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
if(purApplyEntity.getId()!=null){ if(purApplyEntity.getId()!=null){

@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.annotation.RepeatSubmit;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType; import com.glxp.api.constant.ConstantType;
@ -77,6 +79,7 @@ public class PurArrivalController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/arrival/postOrder") @PostMapping("/purchase/arrival/postOrder")
@Log(title = "到货单", businessType = BusinessType.INSERT)
public BaseResponse postOrder(@RequestBody PostPurArrivalRequest purArrivalRequest) { public BaseResponse postOrder(@RequestBody PostPurArrivalRequest purArrivalRequest) {
Long userId = getUserId(); Long userId = getUserId();
@ -150,6 +153,7 @@ public class PurArrivalController extends BaseController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/arrival/auditOrder") @PostMapping("/purchase/arrival/auditOrder")
@Log(title = "审核采购订单", businessType = BusinessType.INSERT)
public BaseResponse auditOrder(@RequestBody PostPurArrivalRequest postPurArrivalRequest) { public BaseResponse auditOrder(@RequestBody PostPurArrivalRequest postPurArrivalRequest) {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurArrivalEntity purArrivalEntity = postPurArrivalRequest.getPurArrivalEntity(); PurArrivalEntity purArrivalEntity = postPurArrivalRequest.getPurArrivalEntity();
@ -243,6 +247,7 @@ public class PurArrivalController extends BaseController {
* *
*/ */
@PostMapping("/purchase/arrival/addOrderDetail") @PostMapping("/purchase/arrival/addOrderDetail")
@Log(title = "采购单", businessType = BusinessType.INSERT)
public BaseResponse addOrderDetail(@RequestBody PurArrivalDetailEntity purOrderDetailEntity) { public BaseResponse addOrderDetail(@RequestBody PurArrivalDetailEntity purOrderDetailEntity) {
boolean falg = purArrivalDetailService.insert(purOrderDetailEntity); boolean falg = purArrivalDetailService.insert(purOrderDetailEntity);
@ -260,6 +265,7 @@ public class PurArrivalController extends BaseController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/arrival/add") @PostMapping("/purchase/arrival/add")
@Log(title = "计划单", businessType = BusinessType.INSERT)
public BaseResponse add() { public BaseResponse add() {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurArrivalEntity purArrivalEntity = new PurArrivalEntity(); PurArrivalEntity purArrivalEntity = new PurArrivalEntity();
@ -277,6 +283,7 @@ public class PurArrivalController extends BaseController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/arrival/delOrderDetailAll") @PostMapping("/purchase/arrival/delOrderDetailAll")
@Log(title = "申购单", businessType = BusinessType.DELETE)
public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
if (purApplyEntity.getId() != null) { if (purApplyEntity.getId() != null) {
@ -293,6 +300,7 @@ public class PurArrivalController extends BaseController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/arrival/updateDetail") @PostMapping("/purchase/arrival/updateDetail")
@Log(title = "计划详情单", businessType = BusinessType.UPDATE)
public BaseResponse detailEdit(@RequestBody PurArrivalDetailEntity purOrderDetailEntity) { public BaseResponse detailEdit(@RequestBody PurArrivalDetailEntity purOrderDetailEntity) {
purArrivalDetailService.update(purOrderDetailEntity); purArrivalDetailService.update(purOrderDetailEntity);
return ResultVOUtils.success("修改成功"); return ResultVOUtils.success("修改成功");
@ -304,6 +312,7 @@ public class PurArrivalController extends BaseController {
* @param ids * @param ids
*/ */
@DeleteMapping("/purchase/arrival/detail/{ids}") @DeleteMapping("/purchase/arrival/detail/{ids}")
@Log(title = "采购订单", businessType = BusinessType.DELETE)
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {
@ -319,6 +328,7 @@ public class PurArrivalController extends BaseController {
* *
*/ */
@PostMapping("/purchase/arrival/addPlanDetailAndOrder") @PostMapping("/purchase/arrival/addPlanDetailAndOrder")
@Log(title = "送货单", businessType = BusinessType.INSERT)
public BaseResponse addPlanDetailAndOrder(@RequestBody PurArrivalRequest purArrivalRequest) { public BaseResponse addPlanDetailAndOrder(@RequestBody PurArrivalRequest purArrivalRequest) {

@ -4,10 +4,12 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.annotation.RepeatSubmit;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType; import com.glxp.api.constant.ConstantType;
@ -87,6 +89,7 @@ public class PurDeliveryController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/delivery/postOrder") @PostMapping("/purchase/delivery/postOrder")
@Log(title = "到货单", businessType = BusinessType.INSERT)
public BaseResponse postOrder(@RequestBody PostPurDeliveryRequest purDeliveryRequest) { public BaseResponse postOrder(@RequestBody PostPurDeliveryRequest purDeliveryRequest) {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
@ -160,6 +163,7 @@ public class PurDeliveryController extends BaseController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/delivery/auditOrder") @PostMapping("/purchase/delivery/auditOrder")
@Log(title = "送货单", businessType = BusinessType.INSERT)
public BaseResponse auditOrder(@RequestBody PostPurDeliveryRequest postPurDeliveryRequest) { public BaseResponse auditOrder(@RequestBody PostPurDeliveryRequest postPurDeliveryRequest) {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurDeliveryEntity purDeliveryEntity = postPurDeliveryRequest.getPurDeliveryEntity(); PurDeliveryEntity purDeliveryEntity = postPurDeliveryRequest.getPurDeliveryEntity();
@ -355,6 +359,7 @@ public class PurDeliveryController extends BaseController {
* @return * @return
*/ */
@PostMapping("/purchase/delivery/list/updateStatus") @PostMapping("/purchase/delivery/list/updateStatus")
@Log(title = "到货单", businessType = BusinessType.UPDATE)
public BaseResponse updateStatus(@RequestBody ReviewDeliveryOrderRequest reviewFinishRequest) { public BaseResponse updateStatus(@RequestBody ReviewDeliveryOrderRequest reviewFinishRequest) {
if (null == reviewFinishRequest && StrUtil.isBlank(reviewFinishRequest.getBillNo())) { if (null == reviewFinishRequest && StrUtil.isBlank(reviewFinishRequest.getBillNo())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -371,6 +376,7 @@ public class PurDeliveryController extends BaseController {
* *
*/ */
@PostMapping("/purchase/delivery/addOrderDetail") @PostMapping("/purchase/delivery/addOrderDetail")
@Log(title = "采购单", businessType = BusinessType.INSERT)
public BaseResponse addOrderDetail(@RequestBody PurDeliveryDetailEntity purOrderDetailEntity) { public BaseResponse addOrderDetail(@RequestBody PurDeliveryDetailEntity purOrderDetailEntity) {
boolean falg = purDeliveryDetailService.insert(purOrderDetailEntity); boolean falg = purDeliveryDetailService.insert(purOrderDetailEntity);
@ -388,6 +394,7 @@ public class PurDeliveryController extends BaseController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/delivery/add") @PostMapping("/purchase/delivery/add")
@Log(title = "计划单", businessType = BusinessType.INSERT)
public BaseResponse add() { public BaseResponse add() {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurDeliveryEntity purArrivalEntity = new PurDeliveryEntity(); PurDeliveryEntity purArrivalEntity = new PurDeliveryEntity();
@ -406,6 +413,7 @@ public class PurDeliveryController extends BaseController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/delivery/delOrderDetailAll") @PostMapping("/purchase/delivery/delOrderDetailAll")
@Log(title = "申购单", businessType = BusinessType.DELETE)
public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
if (purApplyEntity.getId() != null) { if (purApplyEntity.getId() != null) {
@ -422,6 +430,7 @@ public class PurDeliveryController extends BaseController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/delivery/updateDetail") @PostMapping("/purchase/delivery/updateDetail")
@Log(title = "计划详情单", businessType = BusinessType.UPDATE)
public BaseResponse detailEdit(@RequestBody PurDeliveryDetailEntity purDeliveryDetailEntity) { public BaseResponse detailEdit(@RequestBody PurDeliveryDetailEntity purDeliveryDetailEntity) {
purDeliveryDetailService.update(purDeliveryDetailEntity); purDeliveryDetailService.update(purDeliveryDetailEntity);
return ResultVOUtils.success("修改成功"); return ResultVOUtils.success("修改成功");
@ -433,6 +442,7 @@ public class PurDeliveryController extends BaseController {
* @param ids * @param ids
*/ */
@DeleteMapping("/purchase/delivery/detail/{ids}") @DeleteMapping("/purchase/delivery/detail/{ids}")
@Log(title = "采购订单", businessType = BusinessType.DELETE)
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {
@ -447,6 +457,7 @@ public class PurDeliveryController extends BaseController {
* *
*/ */
@PostMapping("/purchase/delivery/addPlanDetailAndOrder") @PostMapping("/purchase/delivery/addPlanDetailAndOrder")
@Log(title = "采购订单", businessType = BusinessType.INSERT)
public BaseResponse addPlanDetailAndOrder(@RequestBody PurDeliveryRequest purDeliveryRequest) { public BaseResponse addPlanDetailAndOrder(@RequestBody PurDeliveryRequest purDeliveryRequest) {
List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purDeliveryRequest.getPurOrderId() + ""); List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purDeliveryRequest.getPurOrderId() + "");
List<PurDeliveryDetailEntity> purDeliveryDetailEntities = purOrderDetailEntities.stream() List<PurDeliveryDetailEntity> purDeliveryDetailEntities = purOrderDetailEntities.stream()

@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.annotation.RepeatSubmit;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType; import com.glxp.api.constant.ConstantType;
@ -77,6 +79,7 @@ public class PurOrderController {
@RepeatSubmit() @RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/order/postOrder") @PostMapping("/purchase/order/postOrder")
@Log(title = "采购计划", businessType = BusinessType.INSERT)
public BaseResponse postOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) { public BaseResponse postOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
@ -147,6 +150,7 @@ public class PurOrderController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/order/dealOrder") @PostMapping("/purchase/order/dealOrder")
@Log(title = "送货单", businessType = BusinessType.INSERT)
public BaseResponse dealOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) { public BaseResponse dealOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) {
PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity(); PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity();
purOrderEntity.setUpdateTime(new Date()); purOrderEntity.setUpdateTime(new Date());
@ -224,6 +228,7 @@ public class PurOrderController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/order/auditOrder") @PostMapping("/purchase/order/auditOrder")
@Log(title = "采购订单", businessType = BusinessType.INSERT)
public BaseResponse auditOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) { public BaseResponse auditOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity(); PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity();
@ -318,6 +323,7 @@ public class PurOrderController {
* *
*/ */
@PostMapping("/purchase/order/addPlanDetailAndOrder") @PostMapping("/purchase/order/addPlanDetailAndOrder")
@Log(title = "采购订单", businessType = BusinessType.INSERT)
public BaseResponse addPlanDetailAndOrder(@RequestBody PurOrderRequest purOrderRequest) { public BaseResponse addPlanDetailAndOrder(@RequestBody PurOrderRequest purOrderRequest) {
if (purOrderRequest.getApplyId() == null || purOrderRequest.getId() == null) { if (purOrderRequest.getApplyId() == null || purOrderRequest.getId() == null) {
@ -376,6 +382,7 @@ public class PurOrderController {
* *
*/ */
@PostMapping("/purchase/order/addOrderDetail") @PostMapping("/purchase/order/addOrderDetail")
@Log(title = "采购订单", businessType = BusinessType.INSERT)
public BaseResponse addOrderDetail(@RequestBody PurOrderDetailEntity purOrderDetailEntity) { public BaseResponse addOrderDetail(@RequestBody PurOrderDetailEntity purOrderDetailEntity) {
boolean falg = purOrderDetailService.insert(purOrderDetailEntity); boolean falg = purOrderDetailService.insert(purOrderDetailEntity);
@ -393,6 +400,7 @@ public class PurOrderController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/order/add") @PostMapping("/purchase/order/add")
@Log(title = "计划单", businessType = BusinessType.INSERT)
public BaseResponse add() { public BaseResponse add() {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurOrderEntity purOrderEntity = new PurOrderEntity(); PurOrderEntity purOrderEntity = new PurOrderEntity();
@ -410,6 +418,7 @@ public class PurOrderController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/order/delOrderDetailAll") @PostMapping("/purchase/order/delOrderDetailAll")
@Log(title = "申购单", businessType = BusinessType.DELETE)
public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
if (purApplyEntity.getId() != null) { if (purApplyEntity.getId() != null) {
@ -426,6 +435,7 @@ public class PurOrderController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/order/updateDetail") @PostMapping("/purchase/order/updateDetail")
@Log(title = "计划详情单", businessType = BusinessType.UPDATE)
public BaseResponse detailEdit(@RequestBody PurOrderDetailEntity purOrderDetailEntity) { public BaseResponse detailEdit(@RequestBody PurOrderDetailEntity purOrderDetailEntity) {
purOrderDetailService.update(purOrderDetailEntity); purOrderDetailService.update(purOrderDetailEntity);
return ResultVOUtils.success("修改成功"); return ResultVOUtils.success("修改成功");
@ -437,6 +447,7 @@ public class PurOrderController {
* @param ids * @param ids
*/ */
@DeleteMapping("/purchase/order/detail/{ids}") @DeleteMapping("/purchase/order/detail/{ids}")
@Log(title = "采购订单", businessType = BusinessType.DELETE)
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {

@ -5,9 +5,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
@ -52,6 +54,7 @@ public class PurOrderReceiveController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/thrsys/order/insertWeb") @PostMapping("/udiwms/thrsys/order/insertWeb")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse addReceive(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) { public BaseResponse addReceive(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -72,6 +75,7 @@ public class PurOrderReceiveController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/receive/order/update") @PostMapping("/udiwms/receive/order/update")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateReceive(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) { public BaseResponse updateReceive(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -117,6 +121,7 @@ public class PurOrderReceiveController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/receive/detail/add") @PostMapping("/udiwms/receive/detail/add")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse updateReceive(@RequestBody AddReceiveDetailRequest addReceiveDetailRequest, BindingResult bindingResult) { public BaseResponse updateReceive(@RequestBody AddReceiveDetailRequest addReceiveDetailRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -161,6 +166,7 @@ public class PurOrderReceiveController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/receive/detail/Update") @PostMapping("/udiwms/receive/detail/Update")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse updateReceiveDetail(@RequestBody UpdateReceiveDetailRequest updateReceiveDetailRequest, BindingResult bindingResult) { public BaseResponse updateReceiveDetail(@RequestBody UpdateReceiveDetailRequest updateReceiveDetailRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -176,6 +182,7 @@ public class PurOrderReceiveController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/receive/order/del") @GetMapping("/udiwms/receive/order/del")
@Log(title = "领用单", businessType = BusinessType.DELETE)
public BaseResponse del(String orderIdFk) { public BaseResponse del(String orderIdFk) {
boolean falg = receiveService.delReceive(orderIdFk); boolean falg = receiveService.delReceive(orderIdFk);
if (falg) { if (falg) {
@ -187,6 +194,7 @@ public class PurOrderReceiveController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/receive/detail/delReceiveDetail") @GetMapping("/udiwms/receive/detail/delReceiveDetail")
@Log(title = "领用单", businessType = BusinessType.DELETE)
public BaseResponse delReceiveDetail(Integer id) { public BaseResponse delReceiveDetail(Integer id) {
boolean falg = receivedetailService.delDetail(id + ""); boolean falg = receivedetailService.delDetail(id + "");
@ -199,6 +207,7 @@ public class PurOrderReceiveController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/receive/order/audit") @PostMapping("/udiwms/receive/order/audit")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse audit(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) { public BaseResponse audit(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.annotation.RepeatSubmit;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType; import com.glxp.api.constant.ConstantType;
@ -87,6 +89,7 @@ public class PurPlanController {
@RepeatSubmit() @RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/plan/postOrder") @PostMapping("/purchase/plan/postOrder")
@Log(title = "采购计划", businessType = BusinessType.INSERT)
public BaseResponse postOrder(@RequestBody PostPurPlanRequest postPurPlanRequest) { public BaseResponse postOrder(@RequestBody PostPurPlanRequest postPurPlanRequest) {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
@ -180,6 +183,7 @@ public class PurPlanController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/plan/auditOrder") @PostMapping("/purchase/plan/auditOrder")
@Log(title = "采购计划", businessType = BusinessType.INSERT)
public BaseResponse auditOrder(@RequestBody PostPurPlanRequest postPurPlanRequest) { public BaseResponse auditOrder(@RequestBody PostPurPlanRequest postPurPlanRequest) {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurPlanEntity purApplyEntity = postPurPlanRequest.getPurPlanEntity(); PurPlanEntity purApplyEntity = postPurPlanRequest.getPurPlanEntity();
@ -269,6 +273,7 @@ public class PurPlanController {
* *
*/ */
@PostMapping("/purchase/plan/addPlanDetailAndApply") @PostMapping("/purchase/plan/addPlanDetailAndApply")
@Log(title = "采购单", businessType = BusinessType.INSERT)
public BaseResponse addPlanDetailAndApply(@RequestBody PurPlanRequest purPlanRequest) { public BaseResponse addPlanDetailAndApply(@RequestBody PurPlanRequest purPlanRequest) {
if (purPlanRequest.getApplyId() == null || purPlanRequest.getId() == null) { if (purPlanRequest.getApplyId() == null || purPlanRequest.getId() == null) {
@ -327,6 +332,7 @@ public class PurPlanController {
* *
*/ */
@PostMapping("/purchase/plan/addPlanDetail") @PostMapping("/purchase/plan/addPlanDetail")
@Log(title = "采购单", businessType = BusinessType.INSERT)
public BaseResponse addPlanDetail(@RequestBody PurPlanDetailEntity purPlanDetailEntity) { public BaseResponse addPlanDetail(@RequestBody PurPlanDetailEntity purPlanDetailEntity) {
boolean falg=purPlanDetailService.insert(purPlanDetailEntity); boolean falg=purPlanDetailService.insert(purPlanDetailEntity);
@ -344,6 +350,7 @@ public class PurPlanController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/plan/add") @PostMapping("/purchase/plan/add")
@Log(title = "计划单", businessType = BusinessType.INSERT)
public BaseResponse add() { public BaseResponse add() {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurPlanEntity purPlanEntity= new PurPlanEntity(); PurPlanEntity purPlanEntity= new PurPlanEntity();
@ -361,6 +368,7 @@ public class PurPlanController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/plan/delPlanDetailAll") @PostMapping("/purchase/plan/delPlanDetailAll")
@Log(title = "申购单", businessType = BusinessType.DELETE)
public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
if(purApplyEntity.getId()!=null){ if(purApplyEntity.getId()!=null){
@ -377,6 +385,7 @@ public class PurPlanController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/plan/updateDetail") @PostMapping("/purchase/plan/updateDetail")
@Log(title = "计划详情单", businessType = BusinessType.UPDATE)
public BaseResponse detailEdit(@RequestBody PurPlanDetailEntity purPlanDetailEntity) { public BaseResponse detailEdit(@RequestBody PurPlanDetailEntity purPlanDetailEntity) {
purPlanDetailService.update(purPlanDetailEntity); purPlanDetailService.update(purPlanDetailEntity);
return ResultVOUtils.success("修改成功"); return ResultVOUtils.success("修改成功");
@ -387,6 +396,7 @@ public class PurPlanController {
* @param ids * @param ids
*/ */
@DeleteMapping("/purchase/plan/detail/{ids}") @DeleteMapping("/purchase/plan/detail/{ids}")
@Log(title = "采购计划", businessType = BusinessType.DELETE)
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {

@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.annotation.RepeatSubmit;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType; import com.glxp.api.constant.ConstantType;
@ -76,6 +78,7 @@ public class PurReturnedController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/returned/postOrder") @PostMapping("/purchase/returned/postOrder")
@Log(title = "到货单", businessType = BusinessType.INSERT)
public BaseResponse postOrder(@RequestBody PostPurReturnedRequest postPurReturnedRequest) { public BaseResponse postOrder(@RequestBody PostPurReturnedRequest postPurReturnedRequest) {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
@ -150,6 +153,7 @@ public class PurReturnedController extends BaseController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/returned/auditOrder") @PostMapping("/purchase/returned/auditOrder")
@Log(title = "采购订单", businessType = BusinessType.INSERT)
public BaseResponse auditOrder(@RequestBody PostPurReturnedRequest postPurReturnedRequest) { public BaseResponse auditOrder(@RequestBody PostPurReturnedRequest postPurReturnedRequest) {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurReturnedEntity purReturnedEntity = postPurReturnedRequest.getPurReturnedEntity(); PurReturnedEntity purReturnedEntity = postPurReturnedRequest.getPurReturnedEntity();
@ -240,6 +244,7 @@ public class PurReturnedController extends BaseController {
* *
*/ */
@PostMapping("/purchase/returned/addOrderDetail") @PostMapping("/purchase/returned/addOrderDetail")
@Log(title = "采购订单", businessType = BusinessType.INSERT)
public BaseResponse addOrderDetail(@RequestBody PurReturnedDetailEntity purOrderDetailEntity) { public BaseResponse addOrderDetail(@RequestBody PurReturnedDetailEntity purOrderDetailEntity) {
boolean falg = purReturnedDetailService.insert(purOrderDetailEntity); boolean falg = purReturnedDetailService.insert(purOrderDetailEntity);
@ -257,6 +262,7 @@ public class PurReturnedController extends BaseController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/returned/add") @PostMapping("/purchase/returned/add")
@Log(title = "计划单", businessType = BusinessType.INSERT)
public BaseResponse add() { public BaseResponse add() {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurReturnedEntity purArrivalEntity = new PurReturnedEntity(); PurReturnedEntity purArrivalEntity = new PurReturnedEntity();
@ -274,6 +280,7 @@ public class PurReturnedController extends BaseController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/purchase/returned/delOrderDetailAll") @PostMapping("/purchase/returned/delOrderDetailAll")
@Log(title = "申购单", businessType = BusinessType.DELETE)
public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
if (purApplyEntity.getId() != null) { if (purApplyEntity.getId() != null) {
@ -290,6 +297,7 @@ public class PurReturnedController extends BaseController {
*/ */
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/purchase/returned/updateDetail") @PostMapping("/purchase/returned/updateDetail")
@Log(title = "计划详情单", businessType = BusinessType.UPDATE)
public BaseResponse detailEdit(@RequestBody PurReturnedDetailEntity purReturnedDetailEntity) { public BaseResponse detailEdit(@RequestBody PurReturnedDetailEntity purReturnedDetailEntity) {
purReturnedDetailService.update(purReturnedDetailEntity); purReturnedDetailService.update(purReturnedDetailEntity);
return ResultVOUtils.success("修改成功"); return ResultVOUtils.success("修改成功");
@ -301,6 +309,7 @@ public class PurReturnedController extends BaseController {
* @param ids * @param ids
*/ */
@DeleteMapping("/purchase/returned/detail/{ids}") @DeleteMapping("/purchase/returned/detail/{ids}")
@Log(title = "采购订单", businessType = BusinessType.DELETE)
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {

@ -5,9 +5,11 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.purchase.*; import com.glxp.api.entity.purchase.*;
@ -83,6 +85,7 @@ public class SupCertController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sup/info/selectAllCert") @PostMapping("/sup/info/selectAllCert")
@Log(title = "资质证书", businessType = BusinessType.INSERT)
public BaseResponse selectAllCert(@RequestBody PostSelCertRequest postSelCertRequest) { public BaseResponse selectAllCert(@RequestBody PostSelCertRequest postSelCertRequest) {
String customerId = null; String customerId = null;
if (StrUtil.isEmpty(postSelCertRequest.getCustomerId())) if (StrUtil.isEmpty(postSelCertRequest.getCustomerId()))
@ -150,6 +153,7 @@ public class SupCertController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sup/info/insertCompanyCert") @PostMapping("/sup/info/insertCompanyCert")
@Log(title = "资质证书", businessType = BusinessType.INSERT)
public BaseResponse insertCompanyCert(@RequestBody SupCertEntity supCertEntity) { public BaseResponse insertCompanyCert(@RequestBody SupCertEntity supCertEntity) {
supCertEntity.setCreateTime(new Date()); supCertEntity.setCreateTime(new Date());
supCertEntity.setUpdateTime(new Date()); supCertEntity.setUpdateTime(new Date());
@ -161,6 +165,7 @@ public class SupCertController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sale/sup/cert/audit") @PostMapping("/sale/sup/cert/audit")
@Log(title = "资质证书", businessType = BusinessType.UPDATE)
public BaseResponse auditSupCert(@RequestBody SupCertEntity supCertEntity) { public BaseResponse auditSupCert(@RequestBody SupCertEntity supCertEntity) {
supCertEntity.setCreateTime(new Date()); supCertEntity.setCreateTime(new Date());
supCertEntity.setUpdateTime(new Date()); supCertEntity.setUpdateTime(new Date());
@ -171,6 +176,7 @@ public class SupCertController {
//撤回单据 //撤回单据
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sale/sup/cert/revoke") @PostMapping("/sale/sup/cert/revoke")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse revokeSupCert(@RequestBody SupCertEntity supCertEntity) { public BaseResponse revokeSupCert(@RequestBody SupCertEntity supCertEntity) {
supCertEntity.setCreateTime(new Date()); supCertEntity.setCreateTime(new Date());
supCertEntity.setUpdateTime(new Date()); supCertEntity.setUpdateTime(new Date());
@ -208,6 +214,7 @@ public class SupCertController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sup/info/updateCompanyCert") @PostMapping("/sup/info/updateCompanyCert")
@Log(title = "资质证书", businessType = BusinessType.UPDATE)
public BaseResponse updateCompanyCert(@RequestBody PostSupCertRequest postSupCertRequest) { public BaseResponse updateCompanyCert(@RequestBody PostSupCertRequest postSupCertRequest) {
SupCertEntity supCertEntity = new SupCertEntity(); SupCertEntity supCertEntity = new SupCertEntity();
BeanUtils.copyProperties(postSupCertRequest, supCertEntity); BeanUtils.copyProperties(postSupCertRequest, supCertEntity);
@ -275,7 +282,7 @@ public class SupCertController {
} }
//查询模板文件是否存在 //查询模板文件是否存在
FilterPdfModuleRequest filterPdfModuleRequest = new FilterPdfModuleRequest(); FilterPdfModuleRequest filterPdfModuleRequest = new FilterPdfModuleRequest();
filterPdfModuleRequest.setId(inspectionPDFTemplateRequest.getModuleId()); filterPdfModuleRequest.setModelKey(inspectionPDFTemplateRequest.getModelKey());
SystemPDFModuleEntity systemPDFModule = systemPDFModuleService.findSystemPDFModule(filterPdfModuleRequest); SystemPDFModuleEntity systemPDFModule = systemPDFModuleService.findSystemPDFModule(filterPdfModuleRequest);
if (null == systemPDFModule) { if (null == systemPDFModule) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");

@ -2,9 +2,11 @@ package com.glxp.api.controller.purchase;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.req.purchase.FilterCertRemindMsgRequest; import com.glxp.api.req.purchase.FilterCertRemindMsgRequest;
import com.glxp.api.res.purchase.SupCertRemindMsgResponse; import com.glxp.api.res.purchase.SupCertRemindMsgResponse;
import com.glxp.api.service.purchase.SupCertRemindMsgService; import com.glxp.api.service.purchase.SupCertRemindMsgService;
@ -46,6 +48,7 @@ public class SupCertRemindMsgController {
* @return * @return
*/ */
@GetMapping("/sup/cert/remind/msg/confirmMsg") @GetMapping("/sup/cert/remind/msg/confirmMsg")
@Log(title = "资质预警", businessType = BusinessType.UPDATE)
public BaseResponse confirmMsg(Integer id, String handleMsg) { public BaseResponse confirmMsg(Integer id, String handleMsg) {
if (null == id || StrUtil.isBlank(handleMsg)) { if (null == id || StrUtil.isBlank(handleMsg)) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -61,6 +64,7 @@ public class SupCertRemindMsgController {
* @return * @return
*/ */
@GetMapping("/sup/cert/remind/msg/ignoreMsg") @GetMapping("/sup/cert/remind/msg/ignoreMsg")
@Log(title = "资质预警", businessType = BusinessType.UPDATE)
public BaseResponse ignoreMsg(Integer id, Integer ignoreStatus) { public BaseResponse ignoreMsg(Integer id, Integer ignoreStatus) {
if (null == id || null == ignoreStatus) { if (null == id || null == ignoreStatus) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);

@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.purchase.SupCertSetEntity; import com.glxp.api.entity.purchase.SupCertSetEntity;
import com.glxp.api.req.purchase.FilterCertSetsRequest; import com.glxp.api.req.purchase.FilterCertSetsRequest;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
@ -51,6 +53,7 @@ public class SupCertSetController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sup/cert/set/add") @PostMapping("/sup/cert/set/add")
@Log(title = "资质证书", businessType = BusinessType.INSERT)
public BaseResponse addCertSet(@RequestBody SupCertSetEntity supCertSetEntity) { public BaseResponse addCertSet(@RequestBody SupCertSetEntity supCertSetEntity) {
if (supCertSetEntity == null) { if (supCertSetEntity == null) {
supCertSetEntity = new SupCertSetEntity(); supCertSetEntity = new SupCertSetEntity();
@ -77,6 +80,7 @@ public class SupCertSetController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sup/cert/set/update") @PostMapping("/sup/cert/set/update")
@Log(title = "资质证书", businessType = BusinessType.UPDATE)
public BaseResponse updateCertSet(@RequestBody SupCertSetEntity supCertSetEntity) { public BaseResponse updateCertSet(@RequestBody SupCertSetEntity supCertSetEntity) {
if (CollUtil.isNotEmpty(supCertSetEntity.getFlbmList())) { if (CollUtil.isNotEmpty(supCertSetEntity.getFlbmList())) {
String flbm = supCertSetEntity.getFlbmList().stream().collect(Collectors.joining(",")); String flbm = supCertSetEntity.getFlbmList().stream().collect(Collectors.joining(","));
@ -99,6 +103,7 @@ public class SupCertSetController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sup/cert/set/delete") @PostMapping("/sup/cert/set/delete")
@Log(title = "资质证书", businessType = BusinessType.DELETE)
public BaseResponse deleteCertSet(@RequestBody DeleteRequest deleteRequest) { public BaseResponse deleteCertSet(@RequestBody DeleteRequest deleteRequest) {
boolean b = supCertSetService.deleteById(deleteRequest.getId()); boolean b = supCertSetService.deleteById(deleteRequest.getId());

@ -5,9 +5,11 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.pinyin.PinyinUtil; import cn.hutool.extra.pinyin.PinyinUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.auth.*; import com.glxp.api.entity.auth.*;
import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpEntity;
@ -88,6 +90,7 @@ public class SupCompanyController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/api/pur/addCompany") @PostMapping("/api/pur/addCompany")
@Log(title = "资质证书", businessType = BusinessType.INSERT)
public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) { public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) {
@ -156,6 +159,7 @@ public class SupCompanyController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/api/pur/modifyCompany") @PostMapping("/api/pur/modifyCompany")
@Log(title = "资质证书", businessType = BusinessType.UPDATE)
public BaseResponse modifyCompany(@RequestBody SupCompanyEntity companyEntity) { public BaseResponse modifyCompany(@RequestBody SupCompanyEntity companyEntity) {
if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE) { if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE) {
@ -214,6 +218,7 @@ public class SupCompanyController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/api/pur/auditCompany") @PostMapping("/api/pur/auditCompany")
@Log(title = "资质证书", businessType = BusinessType.UPDATE)
public BaseResponse auditCompany(@RequestBody SupCompanyEntity companyEntity) { public BaseResponse auditCompany(@RequestBody SupCompanyEntity companyEntity) {
@ -337,6 +342,7 @@ public class SupCompanyController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("api/pur/supCompany/delete") @PostMapping("api/pur/supCompany/delete")
@Log(title = "资质证书", businessType = BusinessType.DELETE)
public BaseResponse deleteSupCompany(@RequestBody DeleteRequest deleteRequest) { public BaseResponse deleteSupCompany(@RequestBody DeleteRequest deleteRequest) {
boolean b = supCompanyService.deleteCompany(deleteRequest.getId()); boolean b = supCompanyService.deleteCompany(deleteRequest.getId());
if (b) if (b)

@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.entity.purchase.SupCertEntity;
@ -91,6 +93,7 @@ public class SupManufacturerController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sup/manufacturer/addCompany") @PostMapping("/sup/manufacturer/addCompany")
@Log(title = "资质证书", businessType = BusinessType.INSERT)
public BaseResponse addCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) { public BaseResponse addCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) {
String customerId = getCustomerId(); String customerId = getCustomerId();
@ -188,6 +191,7 @@ public class SupManufacturerController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sup/manufacturer/modifyCompany") @PostMapping("/sup/manufacturer/modifyCompany")
@Log(title = "资质证书", businessType = BusinessType.UPDATE)
public BaseResponse modifyCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) { public BaseResponse modifyCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) {
if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) { if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) {
@ -293,6 +297,7 @@ public class SupManufacturerController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/sup/manufacturer/audit") @PostMapping("/udiwms/sup/manufacturer/audit")
@Log(title = "资质证书", businessType = BusinessType.UPDATE)
public BaseResponse auditMmanufacturer(@RequestBody SupManufacturerEntity supManufacturerEntity) { public BaseResponse auditMmanufacturer(@RequestBody SupManufacturerEntity supManufacturerEntity) {
if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) { if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) {
@ -383,6 +388,7 @@ public class SupManufacturerController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/sup/manufacturer/basic/delete") @GetMapping("/sup/manufacturer/basic/delete")
@Log(title = "资质证书", businessType = BusinessType.DELETE)
public BaseResponse deleteContact(DeleteRequest deleteRequest) { public BaseResponse deleteContact(DeleteRequest deleteRequest) {
boolean b = supManufacturerService.deleteById(deleteRequest.getId()); boolean b = supManufacturerService.deleteById(deleteRequest.getId());
if (b) if (b)

@ -5,9 +5,11 @@ import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity;
@ -85,6 +87,7 @@ public class SupProductController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sup/product/addRegistration") @PostMapping("/sup/product/addRegistration")
@Log(title = "资质证书", businessType = BusinessType.INSERT)
public BaseResponse addRegistration(@RequestBody SupProductEntity supProductEntity) { public BaseResponse addRegistration(@RequestBody SupProductEntity supProductEntity) {
//提交审核 //提交审核
@ -185,6 +188,7 @@ public class SupProductController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/sup/product/modifyRegistration") @PostMapping("/sup/product/modifyRegistration")
@Log(title = "资质证书", businessType = BusinessType.UPDATE)
public BaseResponse modifyRegistration(@RequestBody SupProductEntity supProductEntity) { public BaseResponse modifyRegistration(@RequestBody SupProductEntity supProductEntity) {
if (StrUtil.isEmpty(supProductEntity.getProductId()) || StrUtil.isEmpty(supProductEntity.getManufacturerIdFk()) || StrUtil.isEmpty(supProductEntity.getCustomerId())) { if (StrUtil.isEmpty(supProductEntity.getProductId()) || StrUtil.isEmpty(supProductEntity.getManufacturerIdFk()) || StrUtil.isEmpty(supProductEntity.getCustomerId())) {
@ -427,6 +431,7 @@ public class SupProductController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/sup/product/delete") @GetMapping("/sup/product/delete")
@Log(title = "资质证书", businessType = BusinessType.DELETE)
public BaseResponse delete(DeleteCompanyFileRequest deleteCompanyFileRequest) { public BaseResponse delete(DeleteCompanyFileRequest deleteCompanyFileRequest) {
boolean b = supProductService.deleteById(deleteCompanyFileRequest.getId()); boolean b = supProductService.deleteById(deleteCompanyFileRequest.getId());
if (b) if (b)

@ -2,9 +2,11 @@ package com.glxp.api.controller.sup;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.auth.*; import com.glxp.api.entity.auth.*;
import com.glxp.api.entity.purchase.CustomerContactEntity; import com.glxp.api.entity.purchase.CustomerContactEntity;
import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.entity.system.CompanyEntity;
@ -93,6 +95,7 @@ public class CustomerController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("salewarehouse/customer/update") @PostMapping("salewarehouse/customer/update")
@Log(title = "客户信息", businessType = BusinessType.UPDATE)
public BaseResponse updateCustomer(@RequestBody @Valid CustomerDetailEntity customerDetailEntity, public BaseResponse updateCustomer(@RequestBody @Valid CustomerDetailEntity customerDetailEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -140,6 +143,7 @@ public class CustomerController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("salewarehouse/customer/modify") @PostMapping("salewarehouse/customer/modify")
@Log(title = "客户信息", businessType = BusinessType.UPDATE)
public BaseResponse modifyCustomer(@RequestBody @Valid CustomerDetailEntity customerDetailEntity, public BaseResponse modifyCustomer(@RequestBody @Valid CustomerDetailEntity customerDetailEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -161,6 +165,7 @@ public class CustomerController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("salewarehouse/customer/delete") @PostMapping("salewarehouse/customer/delete")
@Log(title = "客户信息", businessType = BusinessType.DELETE)
public BaseResponse deleteCustomers(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteCustomers(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -2,8 +2,10 @@ package com.glxp.api.controller.sync;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.entity.sync.BasicDownloadStatusEntity;
import com.glxp.api.req.sync.BasicDownloadRequest; import com.glxp.api.req.sync.BasicDownloadRequest;
import com.glxp.api.req.sync.SpsSyncDataRequest; import com.glxp.api.req.sync.SpsSyncDataRequest;
@ -57,6 +59,7 @@ public class SpsSyncDownloadStatusController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spssync/download/basic/udiinfo/deleteByStatus") @PostMapping("/spssync/download/basic/udiinfo/deleteByStatus")
@Log(title = "定时任务", businessType = BusinessType.DELETE)
public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) { public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) {
boolean b = basicDownloadService.deleteById(deleteRequest.getId()); boolean b = basicDownloadService.deleteById(deleteRequest.getId());
@ -69,6 +72,7 @@ public class SpsSyncDownloadStatusController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spssync/download/basic/udiinfo/updateStatus") @PostMapping("/spssync/download/basic/udiinfo/updateStatus")
@Log(title = "定时任务", businessType = BusinessType.UPDATE)
public BaseResponse updateStatus(@RequestBody BasicDownloadStatusEntity basicDownloadStatusEntity) { public BaseResponse updateStatus(@RequestBody BasicDownloadStatusEntity basicDownloadStatusEntity) {
basicDownloadStatusEntity.setEndTime(new Date()); basicDownloadStatusEntity.setEndTime(new Date());

@ -4,8 +4,10 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity;
import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
import com.glxp.api.req.sync.BasicExportStatusRequest; import com.glxp.api.req.sync.BasicExportStatusRequest;
@ -54,6 +56,7 @@ public class SpsSyncExportStatusController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spssync/basic/udiinfo/deleteByStatus") @PostMapping("/spssync/basic/udiinfo/deleteByStatus")
@Log(title = "定时任务", businessType = BusinessType.DELETE)
public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) { public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) {
boolean b = basicExportService.deleteById(deleteRequest.getId()); boolean b = basicExportService.deleteById(deleteRequest.getId());
@ -66,6 +69,7 @@ public class SpsSyncExportStatusController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spssync/basic/udiinfo/updateStatus") @PostMapping("/spssync/basic/udiinfo/updateStatus")
@Log(title = "定时任务", businessType = BusinessType.UPDATE)
public BaseResponse updateStatus(@RequestBody BasicExportStatusEntity basicExportStatusEntity) { public BaseResponse updateStatus(@RequestBody BasicExportStatusEntity basicExportStatusEntity) {
if (StrUtil.isEmpty(basicExportStatusEntity.getReceiveStatus())) { if (StrUtil.isEmpty(basicExportStatusEntity.getReceiveStatus())) {
basicExportStatusEntity.setEndTime(new Date()); basicExportStatusEntity.setEndTime(new Date());
@ -91,6 +95,7 @@ public class SpsSyncExportStatusController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spssync/basic/schedule/updateLastTime") @PostMapping("/spssync/basic/schedule/updateLastTime")
@Log(title = "定时任务", businessType = BusinessType.UPDATE)
public BaseResponse updateLastTime(@RequestBody BasicExportStatusTimeEntity basicExportStatusTimeEntity) { public BaseResponse updateLastTime(@RequestBody BasicExportStatusTimeEntity basicExportStatusTimeEntity) {
boolean b = basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); boolean b = basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity);

@ -1,5 +1,7 @@
package com.glxp.api.controller.system; package com.glxp.api.controller.system;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.entity.system.CompanyEntity;
import com.glxp.api.req.system.CompanyRequest; import com.glxp.api.req.system.CompanyRequest;
import com.glxp.api.service.system.CompanyService; import com.glxp.api.service.system.CompanyService;
@ -28,6 +30,7 @@ public class CompanyController {
} }
@PostMapping("/warehouse/info/modifyCompany") @PostMapping("/warehouse/info/modifyCompany")
@Log(title = "企业信息", businessType = BusinessType.UPDATE)
public BaseResponse modifyCompany(@RequestBody CompanyEntity companyEntity) { public BaseResponse modifyCompany(@RequestBody CompanyEntity companyEntity) {
boolean b = companyService.modifyCompany(companyEntity); boolean b = companyService.modifyCompany(companyEntity);

@ -1,6 +1,8 @@
package com.glxp.api.controller.system; package com.glxp.api.controller.system;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.system.SysPdaKeyEntity; import com.glxp.api.entity.system.SysPdaKeyEntity;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.req.system.FilterDeviceKeyRequest; import com.glxp.api.req.system.FilterDeviceKeyRequest;
@ -47,6 +49,7 @@ public class DeviceKeyController {
@PostMapping("sale/device/check") @PostMapping("sale/device/check")
@Log(title = "系统信息", businessType = BusinessType.UPDATE)
public BaseResponse checkRegister(@RequestBody @Valid SysPdaKeyEntity sysPdaKeyEntity, public BaseResponse checkRegister(@RequestBody @Valid SysPdaKeyEntity sysPdaKeyEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -76,6 +79,7 @@ public class DeviceKeyController {
@PostMapping("/sale/info/deleterKey") @PostMapping("/sale/info/deleterKey")
@Log(title = "系统信息", businessType = BusinessType.DELETE)
public BaseResponse deleterKey(@RequestBody DeleteRequest deleteRequest) { public BaseResponse deleterKey(@RequestBody DeleteRequest deleteRequest) {
sysPdaKeyService.deleteDeviceKey(deleteRequest); sysPdaKeyService.deleteDeviceKey(deleteRequest);

@ -2,9 +2,11 @@ package com.glxp.api.controller.system;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.auth.SysMenu; import com.glxp.api.entity.auth.SysMenu;
import com.glxp.api.entity.system.SysMenuHelpEntity; import com.glxp.api.entity.system.SysMenuHelpEntity;
import com.glxp.api.req.system.SysMenuHelpRequest; import com.glxp.api.req.system.SysMenuHelpRequest;
@ -58,6 +60,7 @@ public class SysMenuHelpController {
@AuthRuleAnnotation("system/param/help/insertMenuHelp") @AuthRuleAnnotation("system/param/help/insertMenuHelp")
@PostMapping("/system/param/help/insertMenuHelp") @PostMapping("/system/param/help/insertMenuHelp")
@Log(title = "菜单帮助", businessType = BusinessType.INSERT)
public BaseResponse insertMenuHelp(@RequestBody SysMenuHelpRequest sysMenuHelpRequest, public BaseResponse insertMenuHelp(@RequestBody SysMenuHelpRequest sysMenuHelpRequest,
BindingResult bindingResult ) { BindingResult bindingResult ) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -71,6 +74,7 @@ public class SysMenuHelpController {
@AuthRuleAnnotation("system/param/help/updateMenuHelp") @AuthRuleAnnotation("system/param/help/updateMenuHelp")
@PostMapping("/system/param/help/updateMenuHelp") @PostMapping("/system/param/help/updateMenuHelp")
@Log(title = "菜单帮助", businessType = BusinessType.UPDATE)
public BaseResponse updateMenuHelp(@RequestBody SysMenuHelpRequest sysMenuHelpRequest, public BaseResponse updateMenuHelp(@RequestBody SysMenuHelpRequest sysMenuHelpRequest,
BindingResult bindingResult ) { BindingResult bindingResult ) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -84,6 +88,7 @@ public class SysMenuHelpController {
@AuthRuleAnnotation("system/param/help/deleteMenuHelp") @AuthRuleAnnotation("system/param/help/deleteMenuHelp")
@GetMapping("/system/param/help/deleteMenuHelp") @GetMapping("/system/param/help/deleteMenuHelp")
@Log(title = "菜单帮助", businessType = BusinessType.DELETE)
public BaseResponse deleteMenuHelp( String id) { public BaseResponse deleteMenuHelp( String id) {
if(!StringUtils.isNotBlank(id)){ if(!StringUtils.isNotBlank(id)){
return ResultVOUtils.error(999,"参数错误"); return ResultVOUtils.error(999,"参数错误");

@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.ReflectUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.dao.schedule.ScheduledDao; import com.glxp.api.dao.schedule.ScheduledDao;
import com.glxp.api.entity.system.ProductRemarkSetEntity; import com.glxp.api.entity.system.ProductRemarkSetEntity;
import com.glxp.api.entity.system.ScheduledEntity; import com.glxp.api.entity.system.ScheduledEntity;
@ -64,6 +66,7 @@ public class SysParamConfigController {
@AuthRuleAnnotation("system/param/config/save") @AuthRuleAnnotation("system/param/config/save")
@PostMapping("/system/param/config/save") @PostMapping("/system/param/config/save")
@Log(title = "系统参数", businessType = BusinessType.INSERT)
public BaseResponse save(@RequestBody @Valid SysParamConfigSaveRequest sysParamConfigSaveRequest, public BaseResponse save(@RequestBody @Valid SysParamConfigSaveRequest sysParamConfigSaveRequest,
BindingResult bindingResult) { BindingResult bindingResult) {

@ -2,9 +2,11 @@ package com.glxp.api.controller.system;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity;
@ -113,6 +115,7 @@ public class SysPdfModuleController {
@AuthRuleAnnotation("system/pdf/module/updateRl") @AuthRuleAnnotation("system/pdf/module/updateRl")
@PostMapping("/system/pdf/module/updateRl") @PostMapping("/system/pdf/module/updateRl")
@Log(title = "pdf模板", businessType = BusinessType.UPDATE)
public BaseResponse updateRl(@RequestBody SystemPDFTemplateRelevanceEntity systemPDFModuleSaveRequest) { public BaseResponse updateRl(@RequestBody SystemPDFTemplateRelevanceEntity systemPDFModuleSaveRequest) {
systemPDFTemplateRelevanceService.udpateRl(systemPDFModuleSaveRequest); systemPDFTemplateRelevanceService.udpateRl(systemPDFModuleSaveRequest);
return ResultVOUtils.success("修改成功"); return ResultVOUtils.success("修改成功");
@ -142,6 +145,7 @@ public class SysPdfModuleController {
@AuthRuleAnnotation("system/pdf/module/save") @AuthRuleAnnotation("system/pdf/module/save")
@PostMapping("/system/pdf/module/save") @PostMapping("/system/pdf/module/save")
@Log(title = "pdf模板", businessType = BusinessType.INSERT)
public BaseResponse save(@RequestBody @Valid SysPdfModuleSaveRequest sysPdfModuleSaveRequest, public BaseResponse save(@RequestBody @Valid SysPdfModuleSaveRequest sysPdfModuleSaveRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -165,6 +169,7 @@ public class SysPdfModuleController {
@AuthRuleAnnotation("system/pdf/module/update") @AuthRuleAnnotation("system/pdf/module/update")
@PostMapping("/system/pdf/module/update") @PostMapping("/system/pdf/module/update")
@Log(title = "pdf模板", businessType = BusinessType.UPDATE)
public BaseResponse update(@RequestBody SysPdfModuleSaveRequest sysPdfModuleSaveRequest) { public BaseResponse update(@RequestBody SysPdfModuleSaveRequest sysPdfModuleSaveRequest) {
sysPdfModuleSaveRequest.setUpdate_time(new Date()); sysPdfModuleSaveRequest.setUpdate_time(new Date());
systemPDFModuleService.updateById(sysPdfModuleSaveRequest); systemPDFModuleService.updateById(sysPdfModuleSaveRequest);
@ -174,6 +179,7 @@ public class SysPdfModuleController {
@AuthRuleAnnotation("system/pdf/module/delete") @AuthRuleAnnotation("system/pdf/module/delete")
@GetMapping("/system/pdf/module/delete") @GetMapping("/system/pdf/module/delete")
@Log(title = "pdf模板", businessType = BusinessType.DELETE)
public BaseResponse deleteById(@RequestParam("id") Integer id) { public BaseResponse deleteById(@RequestParam("id") Integer id) {

@ -3,9 +3,11 @@ package com.glxp.api.controller.system;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity;
import com.glxp.api.req.system.FilterPdfTemplateRequest; import com.glxp.api.req.system.FilterPdfTemplateRequest;
import com.glxp.api.req.system.SysPdfTemplateSaveRequest; import com.glxp.api.req.system.SysPdfTemplateSaveRequest;
@ -110,6 +112,7 @@ public class SysPdfTemplateController {
@AuthRuleAnnotation("system/pdf/template/save") @AuthRuleAnnotation("system/pdf/template/save")
@PostMapping("/system/pdf/template/save") @PostMapping("/system/pdf/template/save")
@Log(title = "pdf模板", businessType = BusinessType.INSERT)
public BaseResponse save(@RequestBody @Valid SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest, public BaseResponse save(@RequestBody @Valid SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -136,6 +139,7 @@ public class SysPdfTemplateController {
@AuthRuleAnnotation("system/pdf/template/update") @AuthRuleAnnotation("system/pdf/template/update")
@PostMapping("/system/pdf/template/update") @PostMapping("/system/pdf/template/update")
@Log(title = "pdf模板", businessType = BusinessType.UPDATE)
public BaseResponse update(@RequestBody SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest) { public BaseResponse update(@RequestBody SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest) {
// systemPDFTemplateSaveRequest.setId(1); // systemPDFTemplateSaveRequest.setId(1);
if(sysPdfTemplateSaveRequest.getBussinessStatusList()!=null && sysPdfTemplateSaveRequest.getBussinessStatusList().size()>0){ if(sysPdfTemplateSaveRequest.getBussinessStatusList()!=null && sysPdfTemplateSaveRequest.getBussinessStatusList().size()>0){
@ -150,6 +154,7 @@ public class SysPdfTemplateController {
@AuthRuleAnnotation("system/pdf/template/delete") @AuthRuleAnnotation("system/pdf/template/delete")
@PostMapping("/system/pdf/template/delete") @PostMapping("/system/pdf/template/delete")
@Log(title = "pdf模板", businessType = BusinessType.DELETE)
public BaseResponse deleteById(@RequestBody SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest) { public BaseResponse deleteById(@RequestBody SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest) {
if (StringUtils.isNotBlank(sysPdfTemplateSaveRequest.getPath())) {//删除文件 if (StringUtils.isNotBlank(sysPdfTemplateSaveRequest.getPath())) {//删除文件

@ -1,6 +1,8 @@
package com.glxp.api.controller.thrsys; package com.glxp.api.controller.thrsys;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.system.ThirdSysApiEntity; import com.glxp.api.entity.system.ThirdSysApiEntity;
import com.glxp.api.req.system.FilterSysApiRequest; import com.glxp.api.req.system.FilterSysApiRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
@ -34,6 +36,7 @@ public class ThirdSysApiController {
} }
@PostMapping("/sys/api/modifyApi") @PostMapping("/sys/api/modifyApi")
@Log(title = "第三方api", businessType = BusinessType.UPDATE)
public BaseResponse modifyApi(@RequestBody ThirdSysApiEntity thirdSysApiEntity) { public BaseResponse modifyApi(@RequestBody ThirdSysApiEntity thirdSysApiEntity) {
boolean b = thirdSysApiService.modifySysApi(thirdSysApiEntity); boolean b = thirdSysApiService.modifySysApi(thirdSysApiEntity);

@ -2,6 +2,8 @@ package com.glxp.api.controller.thrsys;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.sync.SyncDataBustypeEntity; import com.glxp.api.entity.sync.SyncDataBustypeEntity;
import com.glxp.api.entity.system.SyncUploadDataSetEntity; import com.glxp.api.entity.system.SyncUploadDataSetEntity;
import com.glxp.api.service.system.SyncUploadDataBustypeService; import com.glxp.api.service.system.SyncUploadDataBustypeService;
@ -35,6 +37,7 @@ public class ThirdUploadSetController {
@AuthRuleAnnotation("system/third/syncData/save") @AuthRuleAnnotation("system/third/syncData/save")
@PostMapping("/system/third/syncData/save") @PostMapping("/system/third/syncData/save")
@Log(title = "第三方", businessType = BusinessType.INSERT)
public BaseResponse save(@RequestBody @Valid SyncUploadDataSetEntity syncUploadDataSetEntity public BaseResponse save(@RequestBody @Valid SyncUploadDataSetEntity syncUploadDataSetEntity
) { ) {
List<SyncDataBustypeEntity> busTypes = syncUploadDataSetEntity.getBusTypes(); List<SyncDataBustypeEntity> busTypes = syncUploadDataSetEntity.getBusTypes();

@ -3,9 +3,11 @@ package com.glxp.api.controller.thrsys;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity;
import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity;
@ -98,6 +100,7 @@ public class ThrBusTypeOriginController {
* @return * @return
*/ */
@PostMapping("/udiwms/originBusType/update") @PostMapping("/udiwms/originBusType/update")
@Log(title = "第三方单据类型", businessType = BusinessType.UPDATE)
public BaseResponse updateBussinessType(@RequestBody @Valid ThrBusTypeOriginEntity thrBusTypeOriginEntity, public BaseResponse updateBussinessType(@RequestBody @Valid ThrBusTypeOriginEntity thrBusTypeOriginEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -125,6 +128,7 @@ public class ThrBusTypeOriginController {
* @return * @return
*/ */
@PostMapping("/udiwms/originBusType/add") @PostMapping("/udiwms/originBusType/add")
@Log(title = "第三方单据类型", businessType = BusinessType.INSERT)
public BaseResponse addBussinessType(@RequestBody ThrBusTypeOriginEntity thrBusTypeOriginEntity, public BaseResponse addBussinessType(@RequestBody ThrBusTypeOriginEntity thrBusTypeOriginEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -150,6 +154,7 @@ public class ThrBusTypeOriginController {
* @return * @return
*/ */
@PostMapping("/udiwms/originBusType/delete") @PostMapping("/udiwms/originBusType/delete")
@Log(title = "第三方单据类型", businessType = BusinessType.DELETE)
public BaseResponse delBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse delBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -170,6 +175,7 @@ public class ThrBusTypeOriginController {
* @return * @return
*/ */
@PostMapping("/udiwms/originBusType/download") @PostMapping("/udiwms/originBusType/download")
@Log(title = "第三方单据类型", businessType = BusinessType.INSERT)
public BaseResponse dlBusType(@RequestBody @Valid FilterThrBusTypeOriginRequest filterThrBusTypeOriginRequest, public BaseResponse dlBusType(@RequestBody @Valid FilterThrBusTypeOriginRequest filterThrBusTypeOriginRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -2,10 +2,12 @@ package com.glxp.api.controller.thrsys;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.entity.thrsys.ThrCorpEntity;
import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
@ -75,6 +77,7 @@ public class ThrCorpExportLogController {
} }
@PostMapping("/udiwms/thrCorp/exportLog/deleteLog") @PostMapping("/udiwms/thrCorp/exportLog/deleteLog")
@Log(title = "第三方数据往来单位导出日志", businessType = BusinessType.DELETE)
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -87,6 +90,7 @@ public class ThrCorpExportLogController {
//往来单位excel文件下载 //往来单位excel文件下载
@GetMapping("/udiwms/thrCorp/exportLog/download") @GetMapping("/udiwms/thrCorp/exportLog/download")
@Log(title = "第三方数据往来单位导出日志", businessType = BusinessType.UPDATE)
public void download(FilterThrCorpExportLogRequest filterThrCorpExportLogRequest, HttpServletResponse res) { public void download(FilterThrCorpExportLogRequest filterThrCorpExportLogRequest, HttpServletResponse res) {
List<ThrCorpExportLogEntity> thrCorpExportLogEntities = thrCorpExportLogService.filterThrCorpExportLog(filterThrCorpExportLogRequest); List<ThrCorpExportLogEntity> thrCorpExportLogEntities = thrCorpExportLogService.filterThrCorpExportLog(filterThrCorpExportLogRequest);
@ -123,6 +127,7 @@ public class ThrCorpExportLogController {
//往来单位导出生成Excel并创建生成记录 //往来单位导出生成Excel并创建生成记录
@PostMapping("/udiwms/thrCorp/importLog/export") @PostMapping("/udiwms/thrCorp/importLog/export")
@Log(title = "第三方数据往来单位导出日志", businessType = BusinessType.INSERT)
public BaseResponse excelDownload(@RequestBody ThrCorpExportRequest thrCorpExportRequest) { public BaseResponse excelDownload(@RequestBody ThrCorpExportRequest thrCorpExportRequest) {
//String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls"; //String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls";
@ -157,6 +162,7 @@ public class ThrCorpExportLogController {
//往来单位导出生成Excel并创建生成记录 //往来单位导出生成Excel并创建生成记录
@PostMapping("/udiwms/thrCorp/importLog/upload") @PostMapping("/udiwms/thrCorp/importLog/upload")
@Log(title = "第三方数据往来单位导出日志", businessType = BusinessType.INSERT)
public BaseResponse uploadSmp(@RequestBody ThrCorpExportRequest thrCorpExportRequest) { public BaseResponse uploadSmp(@RequestBody ThrCorpExportRequest thrCorpExportRequest) {
//String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls"; //String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls";

@ -1,9 +1,11 @@
package com.glxp.api.controller.thrsys; package com.glxp.api.controller.thrsys;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity; import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity;
import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
@ -65,6 +67,7 @@ public class ThrCorpImportLogController {
} }
@PostMapping("/udiwms/thrCorp/importLog/deleteLog") @PostMapping("/udiwms/thrCorp/importLog/deleteLog")
@Log(title = "第三方数据往来单位导入日志", businessType = BusinessType.DELETE)
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -2,10 +2,12 @@ package com.glxp.api.controller.thrsys;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
@ -66,6 +68,7 @@ public class ThrCorpsController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/thrsys/delCorps") @PostMapping("/udiwms/thrsys/delCorps")
@Log(title = "第三方往来单位类型", businessType = BusinessType.DELETE)
public BaseResponse delCorps(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse delCorps(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -78,6 +81,7 @@ public class ThrCorpsController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@RequestMapping("/udiwms/thrsys/corp/delAll") @RequestMapping("/udiwms/thrsys/corp/delAll")
@Log(title = "第三方往来单位类型", businessType = BusinessType.DELETE)
public BaseResponse delAll() { public BaseResponse delAll() {
thrCorpService.deleteAll(); thrCorpService.deleteAll();
return ResultVOUtils.success("删除成功"); return ResultVOUtils.success("删除成功");
@ -86,6 +90,7 @@ public class ThrCorpsController {
//第三方服务上传(包括文件导入后上传) //第三方服务上传(包括文件导入后上传)
@PostMapping("/udiwms/thrsys/postCorps") @PostMapping("/udiwms/thrsys/postCorps")
@Log(title = "第三方服务上传", businessType = BusinessType.INSERT)
public BaseResponse postCorps(@RequestBody PostThrCorpRequest postThrCorpRequest, public BaseResponse postCorps(@RequestBody PostThrCorpRequest postThrCorpRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -120,6 +125,7 @@ public class ThrCorpsController {
//接口一键全部 //接口一键全部
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@RequestMapping("/udiwms/thrsys/corp/downloadAll") @RequestMapping("/udiwms/thrsys/corp/downloadAll")
@Log(title = "第三方往来单位类型", businessType = BusinessType.INSERT)
public BaseResponse downloadAll(FilterThrCorpRequest filterThrProductsRequest) { public BaseResponse downloadAll(FilterThrCorpRequest filterThrProductsRequest) {
String data = (String) redisUtil.get(Constant.dlThrProducts); String data = (String) redisUtil.get(Constant.dlThrProducts);
if (data != null && data.equals("true")) { if (data != null && data.equals("true")) {
@ -145,6 +151,7 @@ public class ThrCorpsController {
//选中或者下载全部 //选中或者下载全部
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/thrsys/corp/corpsDlAll") @PostMapping("/udiwms/thrsys/corp/corpsDlAll")
@Log(title = "第三方往来单位类型", businessType = BusinessType.UPDATE)
public BaseResponse corpsDlAll(@RequestBody ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest) { public BaseResponse corpsDlAll(@RequestBody ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest) {
thrUnitMaintainFilterRequest.setThirdSysFk(thrUnitMaintainFilterRequest.getThirdSys()); thrUnitMaintainFilterRequest.setThirdSysFk(thrUnitMaintainFilterRequest.getThirdSys());
String data = (String) redisUtil.get(Constant.dlThrProducts); String data = (String) redisUtil.get(Constant.dlThrProducts);

@ -2,9 +2,11 @@ package com.glxp.api.controller.thrsys;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.thrsys.ThrDeptEntity; import com.glxp.api.entity.thrsys.ThrDeptEntity;
import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
@ -57,6 +59,7 @@ public class ThrDeptController {
} }
@PostMapping("/spms/thrsys/warehouse/save") @PostMapping("/spms/thrsys/warehouse/save")
@Log(title = "第三方仓库", businessType = BusinessType.INSERT)
public BaseResponse save(@RequestBody @Valid ThrDeptEntity thrDeptEntity, public BaseResponse save(@RequestBody @Valid ThrDeptEntity thrDeptEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -127,6 +130,7 @@ public class ThrDeptController {
} }
@PostMapping("/spms/thrsys/warehouse/delete") @PostMapping("/spms/thrsys/warehouse/delete")
@Log(title = "第三方仓库", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
if (deleteRequest.getId() == null) { if (deleteRequest.getId() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);

@ -4,10 +4,12 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.entity.thrsys.ThrInvProductsEntity;
import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity;
@ -70,6 +72,7 @@ public class ThrInvProductsController {
//第三方服务上传(包括文件导入后上传) //第三方服务上传(包括文件导入后上传)
@PostMapping("/udiwms/thrsys/postInvProducts") @PostMapping("/udiwms/thrsys/postInvProducts")
@Log(title = "第三方服务", businessType = BusinessType.INSERT)
public BaseResponse postInvProducts(@RequestBody PostThrInvProductsRequest postThrInvProductsRequest, public BaseResponse postInvProducts(@RequestBody PostThrInvProductsRequest postThrInvProductsRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -108,6 +111,7 @@ public class ThrInvProductsController {
} }
@PostMapping("/udiwms/thrsys/delInvProducts") @PostMapping("/udiwms/thrsys/delInvProducts")
@Log(title = "第三方服务", businessType = BusinessType.DELETE)
public BaseResponse delInvProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse delInvProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -122,12 +126,14 @@ public class ThrInvProductsController {
@RequestMapping("/udiwms/thrsys/invProducts/delAll") @RequestMapping("/udiwms/thrsys/invProducts/delAll")
@Log(title = "第三方服务", businessType = BusinessType.DELETE)
public BaseResponse delAll() { public BaseResponse delAll() {
thrInvProductsService.deleteAll(); thrInvProductsService.deleteAll();
return ResultVOUtils.success("删除成功"); return ResultVOUtils.success("删除成功");
} }
@RequestMapping("/udiwms/thrsys/invProducts/downloadAll") @RequestMapping("/udiwms/thrsys/invProducts/downloadAll")
@Log(title = "第三方服务", businessType = BusinessType.INSERT)
public BaseResponse downloadAll(FilterThrInvProductsRequest filterThrInvProductsRequest) { public BaseResponse downloadAll(FilterThrInvProductsRequest filterThrInvProductsRequest) {
String data = (String) redisUtil.get(Constant.dlThrInvProducts); String data = (String) redisUtil.get(Constant.dlThrInvProducts);
if (data != null && data.equals("true")) { if (data != null && data.equals("true")) {
@ -151,6 +157,7 @@ public class ThrInvProductsController {
} }
@PostMapping("/udiwms/thrsys/invProducts/inpisDlAll") @PostMapping("/udiwms/thrsys/invProducts/inpisDlAll")
@Log(title = "第三方服务", businessType = BusinessType.UPDATE)
public BaseResponse inpisDlAll(@RequestBody ThrOnhandRequest erpOnhandRequest) { public BaseResponse inpisDlAll(@RequestBody ThrOnhandRequest erpOnhandRequest) {
String data = (String) redisUtil.get(Constant.dlThrInvProducts); String data = (String) redisUtil.get(Constant.dlThrInvProducts);

@ -1,10 +1,12 @@
package com.glxp.api.controller.thrsys; package com.glxp.api.controller.thrsys;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.entity.thrsys.ThrInvProductsEntity;
import com.glxp.api.entity.thrsys.ThrInvProductsExportLogEntity; import com.glxp.api.entity.thrsys.ThrInvProductsExportLogEntity;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
@ -65,6 +67,7 @@ public class ThrInvProductsExportLogController {
} }
@PostMapping("/udiwms/invProducts/exportLog/deleteLog") @PostMapping("/udiwms/invProducts/exportLog/deleteLog")
@Log(title = "第三方产品", businessType = BusinessType.DELETE)
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -1,9 +1,11 @@
package com.glxp.api.controller.thrsys; package com.glxp.api.controller.thrsys;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.thrsys.ThrInvProductsImportDetailEntity; import com.glxp.api.entity.thrsys.ThrInvProductsImportDetailEntity;
import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
@ -66,6 +68,7 @@ public class ThrInvProductsImportLogController {
} }
@PostMapping("/udiwms/thrInvProducts/importLog/deleteLog") @PostMapping("/udiwms/thrInvProducts/importLog/deleteLog")
@Log(title = "第三方产品", businessType = BusinessType.DELETE)
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -3,9 +3,11 @@ package com.glxp.api.controller.thrsys;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.thrsys.ThrDeptEntity; import com.glxp.api.entity.thrsys.ThrDeptEntity;
import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
@ -59,6 +61,7 @@ public class ThrInvWarehouseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/thirdSys/sub/inv/warehouse/save") @PostMapping("/thirdSys/sub/inv/warehouse/save")
@Log(title = "第三方仓库", businessType = BusinessType.INSERT)
public BaseResponse save(@RequestBody @Valid ThrInvWarehouseEntity invSubWarehouseEntity, public BaseResponse save(@RequestBody @Valid ThrInvWarehouseEntity invSubWarehouseEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -94,6 +97,7 @@ public class ThrInvWarehouseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/thirdSys/sub/inv/warehouse/edit") @PostMapping("/thirdSys/sub/inv/warehouse/edit")
@Log(title = "第三方仓库", businessType = BusinessType.UPDATE)
public BaseResponse edit(@RequestBody @Valid ThrInvWarehouseEntity invSubWarehouseEntity, public BaseResponse edit(@RequestBody @Valid ThrInvWarehouseEntity invSubWarehouseEntity,
BindingResult bindingResult,FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest ) { BindingResult bindingResult,FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest ) {
@ -130,6 +134,7 @@ public class ThrInvWarehouseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/thirdSys/sub/inv/warehouse/delete") @PostMapping("/thirdSys/sub/inv/warehouse/delete")
@Log(title = "第三方仓库", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
if (deleteRequest.getId() == null) { if (deleteRequest.getId() == null) {

@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.entity.thrsys.*; import com.glxp.api.entity.thrsys.*;
@ -195,6 +197,7 @@ public class ThrOrderController {
@PostMapping("/udiwms/thrsys/delOrder") @PostMapping("/udiwms/thrsys/delOrder")
@Log(title = "第三方", businessType = BusinessType.DELETE)
public BaseResponse delOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse delOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -216,6 +219,7 @@ public class ThrOrderController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/thrsys/delOrderDetail") @PostMapping("/udiwms/thrsys/delOrderDetail")
@Log(title = "第三方", businessType = BusinessType.DELETE)
public BaseResponse delOrderDetail(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse delOrderDetail(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -243,6 +247,7 @@ public class ThrOrderController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@RequestMapping("/udiwms/thrsys/order/delAll") @RequestMapping("/udiwms/thrsys/order/delAll")
@Log(title = "第三方", businessType = BusinessType.DELETE)
public BaseResponse delAll() { public BaseResponse delAll() {
thrOrderService.deleteAll(); thrOrderService.deleteAll();
thrOrderDetailService.deleteAll(); thrOrderDetailService.deleteAll();

@ -1,10 +1,12 @@
package com.glxp.api.controller.thrsys; package com.glxp.api.controller.thrsys;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity;
import com.glxp.api.entity.thrsys.ThrOrderExportLogEntity; import com.glxp.api.entity.thrsys.ThrOrderExportLogEntity;
@ -68,6 +70,7 @@ public class ThrOrderExportLogController {
} }
@PostMapping("/udiwms/thrOrder/exportLog/deleteLog") @PostMapping("/udiwms/thrOrder/exportLog/deleteLog")
@Log(title = "第三方", businessType = BusinessType.DELETE)
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -116,6 +119,7 @@ public class ThrOrderExportLogController {
//业务单据导出生成Excel并创建生成记录 //业务单据导出生成Excel并创建生成记录
@PostMapping("/udiwms/thrOrder/importLog/export") @PostMapping("/udiwms/thrOrder/importLog/export")
@Log(title = "业务单据导出", businessType = BusinessType.INSERT)
public BaseResponse excelDownload(@RequestBody ThrOrderExportRequest thrOrderExportRequest) { public BaseResponse excelDownload(@RequestBody ThrOrderExportRequest thrOrderExportRequest) {
@ -144,6 +148,7 @@ public class ThrOrderExportLogController {
//业务单据上传SMP并创建生成记录 //业务单据上传SMP并创建生成记录
@PostMapping("/udiwms/thrOrder/importLog/uploadSmp") @PostMapping("/udiwms/thrOrder/importLog/uploadSmp")
@Log(title = "业务单据上传SMP", businessType = BusinessType.INSERT)
public BaseResponse uploadSmp(@RequestBody ThrOrderExportRequest thrOrderExportRequest) { public BaseResponse uploadSmp(@RequestBody ThrOrderExportRequest thrOrderExportRequest) {

@ -2,10 +2,12 @@ package com.glxp.api.controller.thrsys;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.thrsys.ThrOrderImportDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderImportDetailEntity;
import com.glxp.api.entity.thrsys.ThrOrderImportLogEntity; import com.glxp.api.entity.thrsys.ThrOrderImportLogEntity;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
@ -74,6 +76,7 @@ public class ThrOrderImportLogController {
@PostMapping("/udiwms/thrOrder/importLog/deleteLog") @PostMapping("/udiwms/thrOrder/importLog/deleteLog")
@Log(title = "单据导出", businessType = BusinessType.DELETE)
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -93,6 +96,7 @@ public class ThrOrderImportLogController {
} }
@PostMapping("/udiwms/thrOrder/importLog/delete") @PostMapping("/udiwms/thrOrder/importLog/delete")
@Log(title = "单据导出", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -1,8 +1,10 @@
package com.glxp.api.controller.thrsys; package com.glxp.api.controller.thrsys;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.req.thrsys.FilterThrOrderUploadLogRequest; import com.glxp.api.req.thrsys.FilterThrOrderUploadLogRequest;
import com.glxp.api.res.thrsys.ThrOrderUploadLogResponse; import com.glxp.api.res.thrsys.ThrOrderUploadLogResponse;
import com.glxp.api.service.thrsys.ThrOrderUploadLogService; import com.glxp.api.service.thrsys.ThrOrderUploadLogService;
@ -41,6 +43,7 @@ public class ThrOrderUploadLogController {
* @return * @return
*/ */
@GetMapping("/udiwms/inout/order/uploadLog/delete") @GetMapping("/udiwms/inout/order/uploadLog/delete")
@Log(title = "单据上传", businessType = BusinessType.DELETE)
public BaseResponse delete(Integer id) { public BaseResponse delete(Integer id) {
boolean result = thrOrderUploadLogService.delete(id); boolean result = thrOrderUploadLogService.delete(id);
if (result) { if (result) {

@ -3,9 +3,11 @@ package com.glxp.api.controller.thrsys;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity; import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity;
@ -83,6 +85,7 @@ public class ThrProductsAddController {
} }
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/thrsys/delThrAddProducts") @PostMapping("/udiwms/thrsys/delThrAddProducts")
@Log(title = "第三方", businessType = BusinessType.DELETE)
public BaseResponse delThrProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse delThrProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -6,9 +6,11 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.basic.BasicNewUploadDiEntity; import com.glxp.api.entity.basic.BasicNewUploadDiEntity;
import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
@ -118,6 +120,7 @@ public class ThrProductsAddDiController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("udiwms/thrsys/addThrAddDiProducts") @PostMapping("udiwms/thrsys/addThrAddDiProducts")
@Log(title = "DI产品信息", businessType = BusinessType.INSERT)
public BaseResponse addThrAddDiProducts(@RequestBody AddThrDiProductsRequest addThrDiProductsRequest, BindingResult bindingResult) { public BaseResponse addThrAddDiProducts(@RequestBody AddThrDiProductsRequest addThrDiProductsRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -164,6 +167,7 @@ public class ThrProductsAddDiController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("udiwms/thrsys/updateThrAddDiProducts") @PostMapping("udiwms/thrsys/updateThrAddDiProducts")
@Log(title = "DI产品信息", businessType = BusinessType.UPDATE)
public BaseResponse updateDiProduct(@RequestBody ThrProductsAddDiEntity thrProductsAddDiEntity, BindingResult bindingResult) { public BaseResponse updateDiProduct(@RequestBody ThrProductsAddDiEntity thrProductsAddDiEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -264,6 +268,7 @@ public class ThrProductsAddDiController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("udiwms/thrsys/delThrAddDiProducts") @PostMapping("udiwms/thrsys/delThrAddDiProducts")
@Log(title = "DI产品信息", businessType = BusinessType.DELETE)
public BaseResponse delThrDiProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse delThrDiProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (null != deleteRequest && deleteRequest.getId() == null) { if (null != deleteRequest && deleteRequest.getId() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -297,6 +302,7 @@ public class ThrProductsAddDiController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/thrsys/addThrAddProducts") @PostMapping("/udiwms/thrsys/addThrAddProducts")
@Log(title = "第三方产品信息", businessType = BusinessType.INSERT)
public BaseResponse saveProduct(@RequestBody ThrProductsAddDiEntity thrProductsAdddiEntity) { public BaseResponse saveProduct(@RequestBody ThrProductsAddDiEntity thrProductsAdddiEntity) {
if (null == thrProductsAdddiEntity) if (null == thrProductsAdddiEntity)
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);

@ -5,9 +5,11 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
@ -166,6 +168,7 @@ public class ThrProductsController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/udiinfo/erp/products/saveProduct") @PostMapping("/udiwms/udiinfo/erp/products/saveProduct")
@Log(title = "第三方产品信息", businessType = BusinessType.INSERT)
public BaseResponse saveProduct(@RequestBody ThrProductsEntity thrProductsEntity,FilterThrProductsRequest filterThrProductsRequest) { public BaseResponse saveProduct(@RequestBody ThrProductsEntity thrProductsEntity,FilterThrProductsRequest filterThrProductsRequest) {

@ -1,10 +1,12 @@
package com.glxp.api.controller.thrsys; package com.glxp.api.controller.thrsys;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
import com.glxp.api.http.ErpBasicClient; import com.glxp.api.http.ErpBasicClient;
@ -68,6 +70,7 @@ public class ThrProductsExportLogController {
} }
@PostMapping("/udiwms/thrProducts/exportLog/deleteLog") @PostMapping("/udiwms/thrProducts/exportLog/deleteLog")
@Log(title = "第三方产品信息", businessType = BusinessType.DELETE)
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -1,9 +1,11 @@
package com.glxp.api.controller.thrsys; package com.glxp.api.controller.thrsys;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity;
import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity;
import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity;
@ -65,6 +67,7 @@ public class ThrProductsImportLogController {
} }
@PostMapping("/udiwms/thrProducts//importLog/deleteLog") @PostMapping("/udiwms/thrProducts//importLog/deleteLog")
@Log(title = "第三方产品信息", businessType = BusinessType.DELETE)
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
@ -105,6 +107,7 @@ public class ThrSystemController {
} }
@PostMapping("/udiwms/basic/thirdsys/update") @PostMapping("/udiwms/basic/thirdsys/update")
@Log(title = "第三方系统", businessType = BusinessType.UPDATE)
public BaseResponse save(@RequestBody @Valid ThrSystemEntity thrSystemEntity, public BaseResponse save(@RequestBody @Valid ThrSystemEntity thrSystemEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -198,6 +201,7 @@ public class ThrSystemController {
} }
@PostMapping("/udiwms/basic/thirdsys/saveDetail") @PostMapping("/udiwms/basic/thirdsys/saveDetail")
@Log(title = "第三方系统", businessType = BusinessType.UPDATE)
public BaseResponse saveDetail(@RequestBody @Valid ThrSystemDetailEntity thrSystemDetailEntity, public BaseResponse saveDetail(@RequestBody @Valid ThrSystemDetailEntity thrSystemDetailEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
@ -219,6 +223,7 @@ public class ThrSystemController {
* @return * @return
*/ */
@PostMapping("/udiwms/basic/thirdsys/updateInterfaceStatus") @PostMapping("/udiwms/basic/thirdsys/updateInterfaceStatus")
@Log(title = "第三方系统", businessType = BusinessType.UPDATE)
public BaseResponse updateInterfaceStatus(@RequestBody List<ThrSystemDetailEntity> list) { public BaseResponse updateInterfaceStatus(@RequestBody List<ThrSystemDetailEntity> list) {
if (CollUtil.isEmpty(list)) { if (CollUtil.isEmpty(list)) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -246,6 +251,7 @@ public class ThrSystemController {
@PostMapping("/udiwms/basic/thirdsys/saveBusTypeDetail") @PostMapping("/udiwms/basic/thirdsys/saveBusTypeDetail")
@Log(title = "第三方系统", businessType = BusinessType.UPDATE)
public BaseResponse saveBusTypeDetail(@RequestBody @Valid ThrSystemBusApiEntity thrSystemBusApiEntity, public BaseResponse saveBusTypeDetail(@RequestBody @Valid ThrSystemBusApiEntity thrSystemBusApiEntity,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -267,6 +273,7 @@ public class ThrSystemController {
* @return * @return
*/ */
@PostMapping("/udiwms/basic/thirdsys/saveBusTypes") @PostMapping("/udiwms/basic/thirdsys/saveBusTypes")
@Log(title = "第三方系统", businessType = BusinessType.INSERT)
public BaseResponse saveBusTypes(@RequestBody ThrSystemBusApiEntity thrSystemBusApiEntity) { public BaseResponse saveBusTypes(@RequestBody ThrSystemBusApiEntity thrSystemBusApiEntity) {
if (null == thrSystemBusApiEntity || null == thrSystemBusApiEntity.getType()) { if (null == thrSystemBusApiEntity || null == thrSystemBusApiEntity.getType()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -280,6 +287,7 @@ public class ThrSystemController {
} }
@GetMapping("/udiwms/basic/thirdsys/delete") @GetMapping("/udiwms/basic/thirdsys/delete")
@Log(title = "第三方系统", businessType = BusinessType.DELETE)
public BaseResponse delete(Integer id) { public BaseResponse delete(Integer id) {
if (null == id) { if (null == id) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);

@ -16,6 +16,8 @@ public interface SystemPDFModuleDao {
SystemPDFModuleEntity findSystemPDFModule(FilterPdfModuleRequest filterPDFModuleRequest); SystemPDFModuleEntity findSystemPDFModule(FilterPdfModuleRequest filterPDFModuleRequest);
SystemPDFModuleEntity findSystemPDFModuleByKey(FilterPdfModuleRequest filterPDFModuleRequest);
SystemPDFModuleEntity selectById(String id); SystemPDFModuleEntity selectById(String id);
boolean updateById(SysPdfModuleSaveRequest sysPdfModuleSaveRequest); boolean updateById(SysPdfModuleSaveRequest sysPdfModuleSaveRequest);

@ -27,6 +27,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.support.CronSequenceGenerator; import org.springframework.scheduling.support.CronSequenceGenerator;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
@ -58,6 +59,7 @@ import okhttp3.Response;
/*数据中继数据中心(接收)*/ /*数据中继数据中心(接收)*/
@Slf4j @Slf4j
@Service @Service
@Transactional(rollbackFor = Exception.class)
public class IdcServiceImpl implements IdcService { public class IdcServiceImpl implements IdcService {
private static final Logger logger = LoggerFactory.getLogger(IdcServiceImpl.class); private static final Logger logger = LoggerFactory.getLogger(IdcServiceImpl.class);
@Value("${file_path}") @Value("${file_path}")

@ -13,6 +13,7 @@ public class InspectionPDFTemplateRequest {
private String orderId; private String orderId;
private Long customerId; private Long customerId;
private Integer moduleId; private Integer moduleId;
private String modelKey;
} }

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save