UDI
/
udiwms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日志

Browse Source
busUser
schry 2 years ago
parent 7421ed30ac
commit a0436b8452
36 changed files with 368 additions and 49 deletions
Show Stats Download Patch File Download Diff File

9
api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.glxp.api.admin.controller.auth;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.auth.AuthRole;
@ -53,6 +55,7 @@ public class AuthAdminController {
/**
* 获取管理员列表
*/
@Log(title = "获取管理员列表")
@AuthRuleAnnotation("admin/auth/admin/index")
@GetMapping("/admin/auth/admin/index")
public BaseResponse index(@Valid AuthAdminQueryRequest authAdminQueryRequest,
@ -99,6 +102,7 @@ public class AuthAdminController {
/**
* 获取角色列表
*/
@Log(title = "获取角色列表")
@AuthRuleAnnotation("admin/auth/admin/roleList")
@GetMapping("/admin/auth/admin/roleList")
public BaseResponse roleList(@RequestParam(value = "page", defaultValue = "1") Integer page,
@ -125,6 +129,7 @@ public class AuthAdminController {
*
* @return
*/
@Log(title = "新增角色",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("admin/auth/admin/save")
@PostMapping("/admin/auth/admin/save")
public BaseResponse save(@RequestBody @Valid AuthAdminSaveRequest authAdminSaveRequest,
@ -169,6 +174,7 @@ public class AuthAdminController {
*
* @return
*/
@Log(title = "修改角色",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("admin/auth/admin/edit")
@PostMapping("/admin/auth/admin/edit")
public BaseResponse edit(@RequestBody @Valid AuthAdminSaveRequest authAdminSaveRequest,
@ -215,6 +221,7 @@ public class AuthAdminController {
return ResultVOUtils.success();
}
@Log(title = "修改角色",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("admin/auth/admin/updateInv")
@PostMapping("/admin/auth/admin/updateInv")
public BaseResponse updateInv(@RequestBody @Valid AuthAdminSaveRequest authAdminSaveRequest,
@ -246,6 +253,7 @@ public class AuthAdminController {
*
* @return
*/
@Log(title = "删除角色",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("admin/auth/admin/delete")
@PostMapping("/admin/auth/admin/delete")
public BaseResponse delete(@RequestBody AuthAdminSaveRequest authAdminSaveRequest) {
@ -269,6 +277,7 @@ public class AuthAdminController {
*
* @return
*/
@Log(title = "获取医院用户列表")
@AuthRuleAnnotation("")
@GetMapping("/admin/auth/admin/hospitalUserList")
public BaseResponse getHospitalUserList() {

4
api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthCheckController.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.glxp.api.admin.controller.auth;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.auth.AuthCheckEntity;
import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
@ -30,6 +32,7 @@ public class AuthCheckController {
@Resource
private AuthCheckService authCheckService;
@Log(title = "获取权限验证列表")
@GetMapping("/udiwms/auth/device/filter")
public BaseResponse index(AuthCheckRequest authCheckRequest,
BindingResult bindingResult) {
@ -47,6 +50,7 @@ public class AuthCheckController {
}
@Log(title = "角色注册",businessType = BusinessType.INSERT)
@PostMapping("/udiwms/auth/device/save")
public BaseResponse save(@RequestBody @Valid AuthCheckEntity authCheckEntity,
BindingResult bindingResult) {

6
api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.glxp.api.admin.controller.auth;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.req.auth.AuthPermissionRuleSaveRequest;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
@ -32,6 +34,7 @@ public class AuthPermissionRuleController {
* 列表
* @return
*/
@Log(title = "获取权限规则相关列表")
@AuthRuleAnnotation("admin/auth/permission_rule/index")
@GetMapping("/admin/auth/permission_rule/index")
public BaseResponse index() {
@ -51,6 +54,7 @@ public class AuthPermissionRuleController {
* @param bindingResult
* @return
*/
@Log(title = "新增权限规则",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("admin/auth/permission_rule/save")
@PostMapping("/admin/auth/permission_rule/save")
public BaseResponse save(@RequestBody @Valid AuthPermissionRuleSaveRequest authPermissionRuleSaveRequest,
@ -82,6 +86,7 @@ public class AuthPermissionRuleController {
* @param bindingResult
* @return
*/
@Log(title = "编辑权限规则",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("admin/auth/permission_rule/edit")
@PostMapping("/admin/auth/permission_rule/edit")
public BaseResponse edit(@RequestBody @Valid AuthPermissionRuleSaveRequest authPermissionRuleSaveRequest,
@ -113,6 +118,7 @@ public class AuthPermissionRuleController {
* @param authPermissionRuleSaveRequest
* @return
*/
@Log(title = "删除权限规则",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("admin/auth/permission_rule/delete")
@PostMapping("/admin/auth/permission_rule/delete")
public BaseResponse delete(@RequestBody AuthPermissionRuleSaveRequest authPermissionRuleSaveRequest) {

8
api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthRoleController.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.glxp.api.admin.controller.auth;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.auth.AuthRoleAdmin;
import com.glxp.api.admin.req.auth.AuthRoleAuthRequest;
import com.glxp.api.admin.req.auth.AuthRoleQueryRequest;
@ -52,6 +54,7 @@ public class AuthRoleController {
/**
* 角色列表
*/
@Log(title = "获取角色列表")
@AuthRuleAnnotation("admin/auth/role/index")
@GetMapping("/admin/auth/role/index")
public BaseResponse index(@Valid AuthRoleQueryRequest authRoleQueryRequest,
@ -81,6 +84,7 @@ public class AuthRoleController {
* @param id
* @return
*/
@Log(title = "获取授权列表")
@AuthRuleAnnotation("admin/auth/role/authList")
@GetMapping("/admin/auth/role/authList")
public BaseResponse authList(@RequestParam("id") Long id) {
@ -101,6 +105,7 @@ public class AuthRoleController {
return ResultVOUtils.success(restMap);
}
@Log(title = "授权",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("admin/auth/role/auth")
@PostMapping("/admin/auth/role/auth")
public BaseResponse auth(@RequestBody @Valid AuthRoleAuthRequest authRoleAuthRequest,
@ -134,6 +139,7 @@ public class AuthRoleController {
* @param bindingResult
* @return
*/
@Log(title = "新增角色",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("admin/auth/role/save")
@PostMapping("/admin/auth/role/save")
public BaseResponse save(@RequestBody @Valid AuthRoleSaveRequest authRoleSaveRequest,
@ -168,6 +174,7 @@ public class AuthRoleController {
* @param bindingResult
* @return
*/
@Log(title = "编辑角色",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("admin/auth/role/edit")
@PostMapping("/admin/auth/role/edit")
public BaseResponse edit(@RequestBody @Valid AuthRoleSaveRequest authRoleSaveRequest,
@ -204,6 +211,7 @@ public class AuthRoleController {
* @param authRoleSaveRequest
* @return
*/
@Log(title = "删除角色",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("admin/auth/role/delete")
@PostMapping("/admin/auth/role/delete")
public BaseResponse delete(@RequestBody AuthRoleSaveRequest authRoleSaveRequest) {

4
api-admin/src/main/java/com/glxp/api/admin/controller/auth/ConnectTestController.java
Unescape Escape View File

@ -1,5 +1,7 @@
package com.glxp.api.admin.controller.auth;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.auth.AuthConnectEntity;
import com.glxp.api.admin.entity.info.CompanyEntity;
import com.glxp.api.admin.req.auth.ConnectRequest;
@ -17,7 +19,7 @@ public class ConnectTestController {
@Resource
CompanyService companyService;
@Log(title = "获取连接测试列表")
@GetMapping("/udiwms/auth/device/connect")
public BaseResponse index(ConnectRequest connequest) {

6
api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptController.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.glxp.api.admin.controller.auth;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.auth.DeptEntity;
import com.glxp.api.admin.req.auth.FilterDeptRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
@ -28,6 +30,7 @@ public class DeptController {
@Resource
private GennerOrderUtils gennerOrderUtils;
@Log(title = "获取部门列表")
@AuthRuleAnnotation("")
@GetMapping("udi/auth/dept/filter")
public BaseResponse filterList(FilterDeptRequest filterDeptRequest) {
@ -39,6 +42,7 @@ public class DeptController {
return ResultVOUtils.success(deptEntityPageSimpleResponse);
}
@Log(title = "新增部门",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("udi/auth/dept/add")
public BaseResponse addDept(@RequestBody DeptEntity deptEntity) {
@ -53,6 +57,7 @@ public class DeptController {
}
@Log(title = "编辑部门",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("udi/auth/dept/update")
public BaseResponse updateDept(@RequestBody DeptEntity deptEntity) {
@ -68,6 +73,7 @@ public class DeptController {
}
@Log(title = "删除部门",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("udi/auth/dept/delete")
public BaseResponse deleteDept(@RequestBody DeleteRequest deleteRequest) {

8
api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java
Unescape Escape View File

@ -3,6 +3,8 @@ package com.glxp.api.admin.controller.auth;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.auth.AuthCheckEntity;
import com.glxp.api.admin.entity.info.DeviceKeyEntity;
import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
@ -62,6 +64,7 @@ public class LoginController {
*
* @return
*/
@Log(title = "用户登录")
@PostMapping(value = "/login")
public BaseResponse index(@RequestBody @Valid LoginRequest loginRequest,
BindingResult bindingResult,
@ -133,6 +136,7 @@ public class LoginController {
*
* @return
*/
@Log(title = "pc用户登录")
@PostMapping(value = "/pc/login")
public BaseResponse pcLogin(@RequestBody @Valid PCLoginRequest loginRequest,
BindingResult bindingResult,
@ -198,6 +202,7 @@ public class LoginController {
@Resource
InvSubWarehouseService invSubWarehouseService;
@Log(title = "用户登录获取仓库列表")
@AuthRuleAnnotation("")
@GetMapping("/admin/auth/login/getInv")
public BaseResponse getInv(HttpServletRequest request) {
@ -218,6 +223,7 @@ public class LoginController {
*
* @return
*/
@Log(title = "获取登录用户信息")
@AuthRuleAnnotation("")
@GetMapping("/admin/auth/login/userInfo")
public BaseResponse userInfo(HttpServletRequest request) {
@ -241,6 +247,7 @@ public class LoginController {
*
* @return
*/
@Log(title = "登出")
@PostMapping("/admin/auth/login/out")
public BaseResponse out() {
return ResultVOUtils.success();
@ -251,6 +258,7 @@ public class LoginController {
*
* @return
*/
@Log(title = "修改密码",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("") // 需要登录验证,但是不需要权限验证时,value 值填空字符串
@PostMapping("/admin/auth/login/password")
public BaseResponse password(@RequestBody @Valid UpdatePasswordRequest updatePasswordRequest,

8
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicBusTypeChangeController.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.glxp.api.admin.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.basic.BasicBusTypeChangeEntity;
import com.glxp.api.admin.req.basic.BasicBusTypeChangeRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
@ -29,6 +31,7 @@ public class BasicBusTypeChangeController {
BasicBusTypeChangeService basicBusTypeChangeService;
@Log(title = "获取单据类型列表")
@AuthRuleAnnotation("")
@GetMapping("/basic/bustype/change/filter")
public BaseResponse filterJoinList(BasicBusTypeChangeRequest basicBusTypeChangeRequest,
@ -48,7 +51,7 @@ public class BasicBusTypeChangeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "新增单据类型",businessType = BusinessType.INSERT)
@PostMapping("/basic/bustype/change/insert")
public BaseResponse insertBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity,
BindingResult bindingResult) {
@ -61,6 +64,7 @@ public class BasicBusTypeChangeController {
return ResultVOUtils.success("更新成功");
}
@Log(title = "编辑新增单据类型",businessType = BusinessType.UPDATE)
@PostMapping("/basic/bustype/change/update")
public BaseResponse updateBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity,
BindingResult bindingResult) {
@ -73,7 +77,7 @@ public class BasicBusTypeChangeController {
return ResultVOUtils.success("更新成功");
}
@Log(title = "删除单据类型",businessType = BusinessType.DELETE)
@PostMapping("/basic/bustype/change/delete")
public BaseResponse delBussinessType(@RequestBody DeleteRequest deleteRequest,
BindingResult bindingResult) {

21
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java
Unescape Escape View File

@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
@ -46,7 +48,7 @@ public class BasicThirdSysController {
@Resource
private BussinessOriginTypeService bussinessOriginTypeService;
@Log(title = "获取第三方系统列表")
@GetMapping("/udiwms/basic/thirdsys/filter")
public BaseResponse filter(FilterBasicThirdSysRequest filterBasicThirdSysRequest,
BindingResult bindingResult) {
@ -69,6 +71,7 @@ public class BasicThirdSysController {
/**
* 扫码精灵获取第三方系统列表
*/
@Log(title = "扫码精灵获取第三方系统列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/basic/thirdsys/get")
public BaseResponse get(FilterBasicThirdSysRequest filterBasicThirdSysRequest,
@ -90,7 +93,7 @@ public class BasicThirdSysController {
return ResultVOUtils.success(basicThirdSysResponses);
}
@Log(title = "获取第三方系统IP")
@GetMapping("/udiwms/basic/thirdsys/selectIp")
public BaseResponse selectIp(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest,
BindingResult bindingResult) {
@ -102,6 +105,7 @@ public class BasicThirdSysController {
return ResultVOUtils.success(basicThirdSysEntity);
}
@Log(title = "新增第三方系统",businessType = BusinessType.INSERT)
@PostMapping("/udiwms/basic/thirdsys/update")
public BaseResponse save(@RequestBody @Valid BasicThirdSysEntity basicThirdSysEntity,
BindingResult bindingResult) {
@ -165,7 +169,7 @@ public class BasicThirdSysController {
return ResultVOUtils.success("更新成功");
}
@Log(title = "获取第三方系统详情列表")
@GetMapping("/udiwms/basic/thirdsys/filterDetail")
public BaseResponse filterDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest,
BindingResult bindingResult) {
@ -183,6 +187,7 @@ public class BasicThirdSysController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "更具key获取第三方系统详情")
@GetMapping("/udiwms/basic/thirdsys/filterDetailByKey")
public BaseResponse filterDetailByKey(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest,
BindingResult bindingResult) {
@ -195,6 +200,7 @@ public class BasicThirdSysController {
return ResultVOUtils.success(basicThirdSysDetailEntity);
}
@Log(title = "编辑第三方系统详情",businessType = BusinessType.UPDATE)
@PostMapping("/udiwms/basic/thirdsys/saveDetail")
public BaseResponse saveDetail(@RequestBody @Valid BasicThirdSysDetailEntity basicThirdSysDetailEntity,
BindingResult bindingResult) {
@ -216,6 +222,7 @@ public class BasicThirdSysController {
* @param list
* @return
*/
@Log(title = "启用第三方系统接口",businessType = BusinessType.UPDATE)
@PostMapping("/udiwms/basic/thirdsys/updateInterfaceStatus")
public BaseResponse updateInterfaceStatus(@RequestBody List<BasicThirdSysDetailEntity> list) {
if (CollUtil.isEmpty(list)) {
@ -225,7 +232,7 @@ public class BasicThirdSysController {
return ResultVOUtils.success("添加成功");
}
@Log(title = "获取单据类型详情")
@GetMapping("/udiwms/basic/thirdsys/filterBusTypeDetail")
public BaseResponse filterBusTypeDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest,
BindingResult bindingResult) {
@ -242,7 +249,7 @@ public class BasicThirdSysController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "更新单据类型详情",businessType = BusinessType.UPDATE)
@PostMapping("/udiwms/basic/thirdsys/saveBusTypeDetail")
public BaseResponse saveBusTypeDetail(@RequestBody @Valid BasicThirdSysBusApiEntity basicThirdSysBusApiEntity,
BindingResult bindingResult) {
@ -264,6 +271,7 @@ public class BasicThirdSysController {
* @param basicThirdSysBusApiEntity
* @return
*/
@Log(title = "第三方系统 业务单据提交接口添加",businessType = BusinessType.INSERT)
@PostMapping("/udiwms/basic/thirdsys/saveBusTypes")
public BaseResponse saveBusTypes(@RequestBody BasicThirdSysBusApiEntity basicThirdSysBusApiEntity) {
if (null == basicThirdSysBusApiEntity || null == basicThirdSysBusApiEntity.getType()) {
@ -283,6 +291,7 @@ public class BasicThirdSysController {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
@Log(title = "根据id删除",businessType = BusinessType.DELETE)
@GetMapping("/udiwms/basic/thirdsys/delete")
public BaseResponse delete(Integer id) {
if (null == id) {
@ -300,6 +309,7 @@ public class BasicThirdSysController {
*
* @return
*/
@Log(title = "测试第三方服务连通性")
@PostMapping("/udiwms/basic/thirdsys/testThirdService")
public BaseResponse testThirdService(@RequestBody BasicThirdSysEntity basicThirdSysEntity) {
return basicThirdSysDetailService.testThirdService(basicThirdSysEntity);
@ -308,6 +318,7 @@ public class BasicThirdSysController {
@Resource
ErpBasicClient erpBasicClient;
@Log(title = "测试第三方服务连通性")
@PostMapping("/udiwms/basic/thirdsys/testThirdInter")
public BaseResponse testThirdInter(@RequestBody BasicThirdSysEntity basicThirdSysEntity) {
return erpBasicClient.testThridConnect(basicThirdSysEntity);

15
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.glxp.api.admin.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
@ -72,6 +74,7 @@ public class BasicUnitMaintainController {
@Resource
private ErpBasicClient erpBasicClient;
@Log(title = "获取往来单位信息维护列表")
@GetMapping("/udiwms/basic/unit/maintain/filter")
public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
BindingResult bindingResult) {
@ -100,6 +103,7 @@ public class BasicUnitMaintainController {
return ResultVOUtils.success(rMap);
}
@Log(title = "获取往来单位信息维护列表2")
@GetMapping("/udiwms/basic/unit/maintain/filter2")
public BaseResponse filterBasicUnitMaintain2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
BindingResult bindingResult) {
@ -117,6 +121,7 @@ public class BasicUnitMaintainController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "新增往来单位信息维护",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/save")
public BaseResponse save(@RequestBody @Valid BasicUnitMaintainEntity basicUnitMaintainSaveRequest,
@ -139,6 +144,7 @@ public class BasicUnitMaintainController {
return ResultVOUtils.success();
}
@Log(title = "编辑往来单位信息维护",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/update")
public BaseResponse update(@RequestBody @Valid BasicUnitMaintainEntity basicUnitMaintainSaveRequest) {
@ -147,6 +153,7 @@ public class BasicUnitMaintainController {
}
// @AuthRuleAnnotation("")
@Log(title = "下载往来单位信息维护")
@GetMapping("/udiwms/unit/download")
public BaseResponse downloadBasicUnit(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
BindingResult bindingResult) {
@ -173,6 +180,7 @@ public class BasicUnitMaintainController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "SC下载往来单位信息维护")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/basic/unit/download")
public BaseResponse scdownloadBasicUnit(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
@ -200,6 +208,7 @@ public class BasicUnitMaintainController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "选入往来单位信息",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/combine")
public BaseResponse combine(@RequestBody CombineUnitRequest combineRequest, BindingResult bindingResult) {
@ -244,6 +253,7 @@ public class BasicUnitMaintainController {
return ResultVOUtils.success("选入成功");
}
@Log(title = "选入全部往来单位信息")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/basic/unit/maintain/combineAll")
public BaseResponse combineAll(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, BindingResult bindingResult) {
@ -265,6 +275,7 @@ public class BasicUnitMaintainController {
return ResultVOUtils.success("后台正在添加，请稍后刷新查看！");
}
@Log(title = "关联新增往来单位信息",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/combineSingle")
public BaseResponse combineSingle(@RequestBody CombineSingleUnitRequest combineRequest, BindingResult bindingResult) {
@ -304,6 +315,7 @@ public class BasicUnitMaintainController {
}
//解除绑定
@Log(title = "解除绑定",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@GetMapping("/udiwms/unit/thirdSys/removeRl")
public BaseResponse uploadThirdServcie(RemoveRelRequest removeRelRequest) {
@ -329,6 +341,7 @@ public class BasicUnitMaintainController {
return ResultVOUtils.success("解除绑定成功！");
}
@Log(title = "删除往来单位信息",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/delete")
public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -352,6 +365,7 @@ public class BasicUnitMaintainController {
}
//查询ERP往来单位
@Log(title = "查询ERP往来单位")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/unitMaintain/filterErp")
public BaseResponse filterErp(BasicUnitMaintainFilterRequest unitMaintainFilterRequest,
@ -415,6 +429,7 @@ public class BasicUnitMaintainController {
}
//获取产品信息详情（多平台）
@Log(title = "获取产品信息详情（多平台）")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/unitMaintain/thirdSys/detail")
public BaseResponse getThirdSysDetail(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,

8
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessChangeTypeController.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.glxp.api.admin.controller.basic;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.constant.ConstantType;
import com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity;
@ -35,6 +37,7 @@ public class BussinessChangeTypeController {
@Resource
private BussinessLocalTypeService bussinessLocalTypeService;
@Log(title = "获取流转单据类型列表")
@AuthRuleAnnotation("")
@GetMapping("/spms/bussinessChangeType/filter")
public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
@ -93,6 +96,7 @@ public class BussinessChangeTypeController {
return ResultVOUtils.success(bussinessTypeEntities);
}
@Log(title = "根据行为删除流转单据类型",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/spms/bussinessChangeType/remove")
public BaseResponse removeBussinessType(@RequestBody BussinessChangeTypeEntity deleteRequest, BindingResult bindingResult) {
@ -105,7 +109,7 @@ public class BussinessChangeTypeController {
return ResultVOUtils.success("删除成功");
}
@Log(title = "根据id删除流转单据类型",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/spms/bussinessChangeType/delete")
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -118,6 +122,7 @@ public class BussinessChangeTypeController {
return ResultVOUtils.success("删除成功");
}
@Log(title = "编辑流转单据类型",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/spms/bussinessChangeType/update")
public BaseResponse updateBussinessType(@RequestBody BussinessChangeTypeEntity bussinessTypeEntity,
@ -139,6 +144,7 @@ public class BussinessChangeTypeController {
return ResultVOUtils.success("更新成功");
}
@Log(title = "新增流转单据类型",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("/spms/bussinessChangeType/insert")
public BaseResponse insertBussinessType(@RequestBody BussinessChangeTypeEntity

13
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java
Unescape Escape View File

@ -5,6 +5,8 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity;
@ -53,6 +55,7 @@ public class BussinessLocalTypeController {
@Resource
private BussinessOriginTypeService bussinessOriginTypeService;
@Log(title = "获取本地单据类型列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/localBusType/filterJoin")
public BaseResponse filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
@ -72,7 +75,7 @@ public class BussinessLocalTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "根据用户获取本地单据类型列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/localBusType/filterJoinByUser")
public BaseResponse filterJoinByUser(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
@ -93,7 +96,7 @@ public class BussinessLocalTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "根据单据获取本地单据类型列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/localBusType/filterByBus")
public BaseResponse filterByBus(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
@ -108,6 +111,7 @@ public class BussinessLocalTypeController {
return ResultVOUtils.success(bussinessTypeEntity.getLocalAction());
}
@Log(title = "获取单据类型列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/localBusType/filter")
public BaseResponse filterBussinessType(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
@ -136,6 +140,7 @@ public class BussinessLocalTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "获取无用户单据类型列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/localBusType/filterUnUse")
public BaseResponse filterUnUse(BusNoUserRequest busNoUserRequest,
@ -160,6 +165,7 @@ public class BussinessLocalTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "删除单据类型",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/localBusType/delete")
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -195,6 +201,7 @@ public class BussinessLocalTypeController {
return ResultVOUtils.success("删除成功");
}
@Log(title = "编辑单据类型",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/localBusType/update")
public BaseResponse updateBussinessType(@RequestBody @Valid BussinessLocalTypeEntity bussinessTypeEntity,
@ -218,6 +225,7 @@ public class BussinessLocalTypeController {
return ResultVOUtils.success("更新成功");
}
@Log(title = "新增单据类型",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/localBusType/add")
public BaseResponse addBussinessType(@RequestBody BussinessLocalTypeEntity bussinessTypeEntity,
@ -251,6 +259,7 @@ public class BussinessLocalTypeController {
*
* @return
*/
@Log(title = "第三方系统，单据提交接口，查询未绑定的业务单据类型")
@GetMapping("/udiwms/localBusType/filterForThirdSys")
public BaseResponse filterForThirdSys() {
List<BussinessLocalTypeEntity> list = bussinessLocalTypeService.filterForThirdSys();

10
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java
Unescape Escape View File

@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
@ -40,6 +42,7 @@ public class BussinessOriginTypeController {
@Resource
private BasicThirdSysService basicThirdSysService;
@Log(title = "获取原始单据类型列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/originBusType/filter")
public BaseResponse filterList(BussinessOriginTypeFilterRequest bussinessTypeFilterRequest,
@ -68,7 +71,7 @@ public class BussinessOriginTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "获取原始单据类型列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/originBusType/filterJoin")
public BaseResponse filterJoinList(BussinessOriginTypeFilterRequest bussinessTypeFilterRequest,
@ -88,7 +91,7 @@ public class BussinessOriginTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "编辑原始单据类型",businessType = BusinessType.UPDATE)
@PostMapping("/udiwms/originBusType/update")
public BaseResponse updateBussinessType(@RequestBody @Valid BussinessOriginTypeEntity bussinessTypeEntity,
BindingResult bindingResult) {
@ -110,6 +113,7 @@ public class BussinessOriginTypeController {
return ResultVOUtils.success("更新成功");
}
@Log(title = "新增原始单据类型",businessType = BusinessType.INSERT)
@PostMapping("/udiwms/originBusType/add")
public BaseResponse addBussinessType(@RequestBody BussinessOriginTypeEntity bussinessTypeEntity,
BindingResult bindingResult) {
@ -131,6 +135,7 @@ public class BussinessOriginTypeController {
return ResultVOUtils.success("更新成功");
}
@Log(title = "删除原始单据类型",businessType = BusinessType.DELETE)
@PostMapping("/udiwms/originBusType/delete")
public BaseResponse delBussinessType(@RequestBody DeleteRequest deleteRequest,
BindingResult bindingResult) {
@ -146,6 +151,7 @@ public class BussinessOriginTypeController {
return ResultVOUtils.success("更新成功");
}
@Log(title = "下载原始单据类型")
@PostMapping("/udiwms/originBusType/download")
public BaseResponse dlBusType(@RequestBody @Valid BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest,
BindingResult bindingResult) {

18
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java
Unescape Escape View File

@ -6,10 +6,8 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.BussinessTypeUtils;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.constant.ConstantType;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.*;
import com.glxp.api.admin.entity.basic.BusDataEntity;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
@ -68,6 +66,7 @@ public class BussinessTypeController {
@Resource
CustomerService customerService;
@Log(title = "获取业务类型维护列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/bussinessType/filter")
public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
@ -97,6 +96,7 @@ public class BussinessTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "获取业务类型维护列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/bussinessType/joinFilter")
public BaseResponse filterJoinBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
@ -143,7 +143,7 @@ public class BussinessTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "根据用户获取所有业务类型维护列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/bussinessType/filterAllByUser")
public BaseResponse filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest,
@ -163,7 +163,7 @@ public class BussinessTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "下载业务类型维护列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/bussinessType/download")
public BaseResponse downloadJoinBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
@ -193,6 +193,7 @@ public class BussinessTypeController {
@Resource
WarehouseBussinessTypeService warehouseBussinessTypeService;
@Log(title = "删除业务类型维护列表",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/bussinessType/delete")
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -222,6 +223,7 @@ public class BussinessTypeController {
return ResultVOUtils.success("删除成功");
}
@Log(title = "更新业务类型维护列表",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/bussinessType/update")
public BaseResponse updateBussinessType(@RequestBody BussinessTypeEntity bussinessTypeEntity,
@ -239,6 +241,7 @@ public class BussinessTypeController {
return ResultVOUtils.success("更新成功");
}
@Log(title = "新增业务类型维护列表",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/bussinessType/insert")
public BaseResponse insertBussinessType(@RequestBody BussinessTypeEntity bussinessTypeEntity, BindingResult bindingResult) {
@ -259,6 +262,7 @@ public class BussinessTypeController {
//扫码单据类型导入
@Log(title = "扫码单据类型导入",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/busstiness/file/upload")
public BaseResponse uploadProducts(@RequestParam("file") List<MultipartFile> files) {
@ -288,6 +292,7 @@ public class BussinessTypeController {
//扫码单据类型导出
@Log(title = "扫码单据类型导出")
@PostMapping("udiwms/busstiness/file/export")
public void exportXml(HttpServletResponse res) {
@ -319,6 +324,7 @@ public class BussinessTypeController {
*
* @return
*/
@Log(title = "获取候选补单单据类型")
@AuthRuleAnnotation("")
@GetMapping("/warehouse/bussinessType/candidateBussinessType")
public BaseResponse candidateBussinessType(CndidateRequest cndidateRequest) {

8
api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpExportLogController.java
Unescape Escape View File

@ -1,7 +1,9 @@
package com.glxp.api.admin.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
import com.glxp.api.admin.entity.basic.CorpExportLogEntity;
import com.glxp.api.admin.req.basic.*;
@ -42,6 +44,7 @@ public class CorpExportLogController {
private BasicGenJsonService basicGenJsonService;
;
@Log(title = "获取往来单位导出日志列表")
@GetMapping("/udiwms/corps/exportLog/filter")
public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques,
BindingResult bindingResult) {
@ -59,6 +62,7 @@ public class CorpExportLogController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "删除往来单位导出日志",businessType = BusinessType.DELETE)
@PostMapping("/udiwms/corps/exportLog/deleteLog")
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -71,6 +75,7 @@ public class CorpExportLogController {
}
//往来单位excel文件下载
@Log(title = "往来单位excel文件下载",businessType = BusinessType.UPDATE)
@GetMapping("/udiwms/corps/exportLog/download")
public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) {
@ -107,6 +112,7 @@ public class CorpExportLogController {
}
//往来单位导出生成Excel，并创建生成记录
@Log(title = "往来单位导出生成Excel，并创建生成记录",businessType = BusinessType.INSERT)
@PostMapping("/udiwms/corps/importLog/export")
public BaseResponse excelDownload(@RequestBody CorpsExportRequest corpsExportRequest) {
String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".udi";
@ -125,6 +131,7 @@ public class CorpExportLogController {
}
//往来单位上传SMP，并创建生成记录
@Log(title = "往来单位上传SMP，并创建生成记录，并创建生成记录")
@PostMapping("/udiwms/corps/importLog/uploadSmp")
public BaseResponse uploadSmp(@RequestBody CorpsExportRequest corpsExportRequest) {
CorpExportLogEntity corpExportLogEntity = new CorpExportLogEntity();
@ -141,6 +148,7 @@ public class CorpExportLogController {
}
//往来单位接口下载（第三方使用）
@Log(title = "往来单位接口下载（第三方使用）")
@GetMapping("/udiwms/basic/corps/download")
public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
BindingResult bindingResult) {

9
api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpImportLogController.java
Unescape Escape View File

@ -3,7 +3,9 @@ package com.glxp.api.admin.controller.basic;
import cn.hutool.core.io.IoUtil;
import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.basic.*;
import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest;
import com.glxp.api.admin.req.basic.PostCorpsRequest;
@ -42,6 +44,7 @@ public class CorpImportLogController {
@Resource
BasicCorpImportService basicCorpImportService;
@Log(title = "获取往来单位导入日志列表")
@GetMapping("/udiwms/corps/importLog/filter")
public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest,
BindingResult bindingResult) {
@ -59,6 +62,7 @@ public class CorpImportLogController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "获取往来单位导入日志详情列表")
@GetMapping("/udiwms/corps/importLog/filterDetail")
public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest,
BindingResult bindingResult) {
@ -76,7 +80,7 @@ public class CorpImportLogController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "删除往来单位导入日志",businessType = BusinessType.DELETE)
@PostMapping("/udiwms/corps/importLog/deleteLog")
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -96,6 +100,7 @@ public class CorpImportLogController {
return ResultVOUtils.success("删除成功");
}
@Log(title = "删除往来单位导入日志",businessType = BusinessType.DELETE)
@PostMapping("/udiwms/corps/importLog/delete")
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -110,6 +115,7 @@ public class CorpImportLogController {
//往来单位信息文件导入
@Log(title = "往来单位信息文件导入")
@PostMapping("/udiwms/corps/importLog/upload")
public BaseResponse uploadCorp(@RequestParam("file") List<MultipartFile> files, @RequestParam("thirdSys") String thirdSys) {
String filePath = "D:\\udiwms\\filePath\\";
@ -153,6 +159,7 @@ public class CorpImportLogController {
//往来单位信息接口上传
@Log(title = "往来单位信息接口上传")
@PostMapping("/udiwms/basic/corps/upload")
public BaseResponse postUdiInfo(@RequestBody PostCorpsRequest postCorpsRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {

11
api-admin/src/main/java/com/glxp/api/admin/controller/basic/EntrustReceController.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.glxp.api.admin.controller.basic;
//委托验收
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.basic.DlEntrustReceEntity;
import com.glxp.api.admin.entity.basic.EntrustReceEntity;
@ -35,6 +37,7 @@ public class EntrustReceController {
@Resource
private BussinessTypeService bussinessTypeService;
@Log(title = "获取委托验收列表信息")
@GetMapping("/spms/entrust/rece/filter")
public BaseResponse getEntrustRece(BasicEntrustRecRequest basicExportStatusRequest) {
List<EntrustReceResponse> entrustReceEntities = entrustReceService.filterJoinEntrustRec(basicExportStatusRequest);
@ -47,6 +50,7 @@ public class EntrustReceController {
}
//手持终端下载委托验收
@Log(title = "手持终端下载委托验收")
@GetMapping("/spms/entrust/rece/downloads")
public BaseResponse downloadEntrust(BasicEntrustRecRequest basicExportStatusRequest) {
Integer userId = customerService.getUserId();
@ -60,7 +64,7 @@ public class EntrustReceController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "根据用户获取单据类型列表信息")
@GetMapping("/spms/entrust/rece/filterAllNoUse")
public BaseResponse filterAllNoUse(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
Integer uerId = customerService.getUserId();
@ -70,7 +74,7 @@ public class EntrustReceController {
}
@Log(title = "新增委托验收信息",businessType = BusinessType.INSERT)
@PostMapping("/spms/entrust/rece/add")
public BaseResponse aadEntrustRece(@RequestBody EntrustReceEntity entrustReceEntity) {
Integer userId = customerService.getUserId();
@ -85,7 +89,7 @@ public class EntrustReceController {
}
@Log(title = "编辑委托验收信息",businessType = BusinessType.UPDATE)
@PostMapping("/spms/entrust/rece/update")
public BaseResponse updateEntrustRece(@RequestBody EntrustReceEntity entrustReceEntity) {
boolean b = entrustReceService.updateEntrustRec(entrustReceEntity);
@ -97,6 +101,7 @@ public class EntrustReceController {
}
@Log(title = "删除委托验收信息",businessType = BusinessType.DELETE)
@PostMapping("/spms/entrust/rece/delete")
public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) {

7
api-admin/src/main/java/com/glxp/api/admin/controller/basic/NewUploadDiController.java
Unescape Escape View File

@ -4,6 +4,8 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.dao.basic.BasicThirdSysDao;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.api.admin.entity.basic.CorpImportLogEntity;
@ -43,6 +45,7 @@ public class NewUploadDiController {
@Resource
private BasicThirdSysDao basicThirdSysDao;
@Log(title = "上传新Di信息")
@PostMapping("/udiwms/basic/newDi/postThird")
public BaseResponse postThird(@RequestBody NewUploadDiEntity newUploadDiEntity, BindingResult bindingResult) {
@ -88,7 +91,7 @@ public class NewUploadDiController {
}
@Log(title = "获取新Di列表信息")
@GetMapping("/udiwms/basic/newDi/filter")
public BaseResponse filter(FilterNewUploadDiRequest filterNewUploadDiRequest,
BindingResult bindingResult) {
@ -106,7 +109,7 @@ public class NewUploadDiController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "删除",businessType = BusinessType.DELETE)
@PostMapping("/udiwms/basic/newDi/delete")
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {

11
api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncDownloadController.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.glxp.api.admin.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.basic.BasicDownloadStatusEntity;
import com.glxp.api.admin.httpclient.SpGetHttpClient;
import com.glxp.api.admin.req.basic.BasicDownloadRequest;
@ -35,13 +37,14 @@ public class SpsSyncDownloadController {
@Resource
DlBasicService dlBasicService;
@Log(title = "获取sps同步下载列表信息")
@GetMapping("/spssync/download/basic/udiinfo/getStatus")
public BaseResponse getStatus(BasicDownloadRequest basicDownloadRequest) {
List<BasicDownloadStatusEntity> basicDownloadStatusEntities = basicDownloadService.filterDownloadStatus(basicDownloadRequest);
return ResultVOUtils.success(basicDownloadStatusEntities);
}
@Log(title = "获取sps同步下载列表信息")
@GetMapping("/spssync/download/basic/udiinfo/filter")
public BaseResponse filterStatus(BasicDownloadRequest basicDownloadRequest) {
List<BasicDownloadStatusEntity> basicDownloadStatusEntities = basicDownloadService.filterDownloadStatus(basicDownloadRequest);
@ -53,7 +56,7 @@ public class SpsSyncDownloadController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "根据状态删除",businessType = BusinessType.DELETE)
@PostMapping("/spssync/download/basic/udiinfo/deleteByStatus")
public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) {
@ -65,6 +68,7 @@ public class SpsSyncDownloadController {
return ResultVOUtils.error(500, "删除失败！");
}
@Log(title = "编辑状态",businessType = BusinessType.UPDATE)
@PostMapping("/spssync/download/basic/udiinfo/updateStatus")
public BaseResponse updateStatus(@RequestBody BasicDownloadStatusEntity basicDownloadStatusEntity) {
@ -89,6 +93,7 @@ public class SpsSyncDownloadController {
* @param type
* @return
*/
@Log(title = "立即下载数据")
@GetMapping("/spsync/download/now")
public BaseResponse downloadNow(Integer type) {
if (null == type) {
@ -97,4 +102,4 @@ public class SpsSyncDownloadController {
return dlBasicService.downloadNow(type);
}
}
}

12
api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java
Unescape Escape View File

@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.basic.BasicExportStatusEntity;
import com.glxp.api.admin.entity.basic.BasicExportStatusTimeEntity;
@ -52,12 +54,14 @@ public class SpsSyncExportStatusController {
@Resource
SpGetHttpClient spGetHttp;
@Log(title = "获取sps同步导出状态列表信息")
@GetMapping("/spssync/basic/udiinfo/getStatus")
public BaseResponse getStatus(BasicExportStatusRequest basicExportStatusRequest) {
List<BasicExportStatusEntity> basicExportStatusEntities = basicExportService.filterExportStatus(basicExportStatusRequest);
return ResultVOUtils.success(basicExportStatusEntities);
}
@Log(title = "获取sps同步导出状态列表信息")
@GetMapping("/spssync/basic/udiinfo/filter")
public BaseResponse filterStatus(BasicExportStatusRequest basicExportStatusRequest) {
@ -71,7 +75,7 @@ public class SpsSyncExportStatusController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "删除sps同步导出状态",businessType = BusinessType.DELETE)
@PostMapping("/spssync/basic/udiinfo/deleteByStatus")
public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) {
@ -83,6 +87,7 @@ public class SpsSyncExportStatusController {
return ResultVOUtils.error(500, "删除失败！");
}
@Log(title = "编辑sps同步导出状态",businessType = BusinessType.UPDATE)
@PostMapping("/spssync/basic/udiinfo/updateStatus")
public BaseResponse updateStatus(@RequestBody BasicExportStatusEntity basicExportStatusEntity) {
@ -95,12 +100,14 @@ public class SpsSyncExportStatusController {
return ResultVOUtils.error(500, "更新成功！");
}
@Log(title = "测试连接")
@GetMapping("/spssync/basic/connect/test")
public BaseResponse testConnect() {
return spGetHttp.testConnect();
}
@Log(title = "获取最后更新时间")
@GetMapping("/spssync/basic/schedule/lastTime")
public BaseResponse getLastUpdateTime(BasicExportTimeRequest basicExportTimeRequest) {
List<BasicExportStatusTimeEntity> basicExportStatusEntities = basicExportTimeService.filterExportStatus(basicExportTimeRequest);
@ -111,6 +118,7 @@ public class SpsSyncExportStatusController {
}
}
@Log(title = "编辑最后更新时间",businessType = BusinessType.INSERT)
@PostMapping("/spssync/basic/schedule/updateLastTime")
public BaseResponse updateLastTime(@RequestBody BasicExportStatusTimeEntity basicExportStatusTimeEntity) {
@ -194,4 +202,4 @@ public class SpsSyncExportStatusController {
}
}
}

7
api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java
Unescape Escape View File

@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.api.admin.entity.basic.ProductInfoEntity;
@ -57,6 +59,7 @@ public class UdiContrastController {
GennerOrderUtils gennerOrderUtils;
//添加产品
@Log(title = "添加产品")
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/revleance")
public BaseResponse revleanceUdi(@RequestBody CombineRequest combineRequest) {
@ -110,6 +113,7 @@ public class UdiContrastController {
return ResultVOUtils.success("添加成功");
}
@Log(title = "切换版本")
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/changeVersion")
public BaseResponse changeVersion(@RequestBody CombineRequest combineRequest) {
@ -138,6 +142,7 @@ public class UdiContrastController {
//更换关联ERP产品
@Log(title = "更换关联ERP产品",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/modifyRel")
public BaseResponse modifyRel(@RequestBody CombineRequest combineRequest) {
@ -173,6 +178,7 @@ public class UdiContrastController {
//解除绑定产品信息ID
@Log(title = "解除绑定产品信息ID",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@GetMapping("/udiwms/udirl/thirdSys/remove")
public BaseResponse removeThirdId(RemoveRelRequest removeRelRequest) {
@ -226,6 +232,7 @@ public class UdiContrastController {
ProductInfoService productInfoService;
//獲取DI版本号
@Log(title = "获取DI版本号")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/syncdi/version")
public BaseResponse getVersion(CombineRequest combineRequest) {

11
api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java
Unescape Escape View File

@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.basic.*;
import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.api.admin.httpclient.ErpBasicClient;
@ -50,6 +52,7 @@ public class UdiInfoController {
SyncUdiService syncUdiService;
//获取同步库UDI信息
@Log(title = "获取同步库UDI信息")
@AuthRuleAnnotation("")
@GetMapping("udiwms/udiinfo/filterUdi")
public BaseResponse filterUdi(FilterUdiInfoRequest filterUdiInfoRequest) {
@ -111,6 +114,7 @@ public class UdiInfoController {
//获取同步库医疗器械注册人信息
@Log(title = "获取同步库医疗器械注册人信息")
@AuthRuleAnnotation("")
@GetMapping("udiwms/udiinfo/filterCompany")
public BaseResponse filterCompany(UdiCompanyRequest udiCompanyRequest) {
@ -125,6 +129,7 @@ public class UdiInfoController {
}
//获取本地已维护UDI信息
@Log(title = "获取本地已维护UDI信息")
@AuthRuleAnnotation("")
@GetMapping("udiwms/udiinfo/local/filterByUuid")
public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) {
@ -146,6 +151,7 @@ public class UdiInfoController {
}
//获取ERP产品信息
@Log(title = "获取ERP产品信息")
@AuthRuleAnnotation("")
@GetMapping("udiwms/udiinfo/erp/products")
public BaseResponse getErpProducts(FilterErpGoodsRequest filterErpGoodsRequest,
@ -210,6 +216,7 @@ public class UdiInfoController {
}
@Log(title = "获取产品信息")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/basic/instrument/maintain/filterProduct")
public BaseResponse filterProduct(FilterUdiInfoRequest filterUdiInfoRequest) {
@ -223,6 +230,7 @@ public class UdiInfoController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "根据UDI码获取产品信息")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/basic/findByCode")
public BaseResponse findByCode(FilterUdiInfoRequest filterUdiInfoRequest) {
@ -243,6 +251,7 @@ public class UdiInfoController {
*
* @return
*/
@Log(title = "新增第三方产品信息",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/udiinfo/erp/products/saveProduct")
public BaseResponse saveProduct(@RequestBody ThrProductsEntity thrProductsEntity) {
@ -262,4 +271,4 @@ public class UdiInfoController {
return ResultVOUtils.success();
}
}
}

10
api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java
Unescape Escape View File

@ -1,7 +1,9 @@
package com.glxp.api.admin.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity;
import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest;
import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
@ -50,7 +52,7 @@ public class UdiInfoExportLogController {
@Resource
BasicGenJsonService basicGenJsonService;
@Log(title = "获取医疗器械信息导出列表信息")
@GetMapping("/udiwms/products/exportLog/filter")
public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques,
BindingResult bindingResult) {
@ -68,6 +70,7 @@ public class UdiInfoExportLogController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "删除日志",businessType = BusinessType.DELETE)
@PostMapping("/udiwms/products/exportLog/deleteLog")
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -80,6 +83,7 @@ public class UdiInfoExportLogController {
}
//产品信息excel文件下载
@Log(title = "产品信息excel文件下载")
@GetMapping("/udiwms/products/exportLog/download")
public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) {
@ -116,6 +120,7 @@ public class UdiInfoExportLogController {
}
//产品信息导出生成Excel，并创建生成记录
@Log(title = "产品信息导出生成Excel，并创建生成记录")
@PostMapping("/udiwms/products/importLog/export")
public BaseResponse excelDownload(@RequestBody UdiInfoExportRequest udiInfoExportRequest) {
UdiInfoExportLogEntity udiInfoExportLogEntity = new UdiInfoExportLogEntity();
@ -135,6 +140,7 @@ public class UdiInfoExportLogController {
}
//产品信息上传SMP，并创建生成记录
@Log(title = "产品信息上传SMP，并创建生成记录")
@PostMapping("/udiwms/products/importLog/uploadSmp")
public BaseResponse uploadSmp(@RequestBody UdiInfoExportRequest udiInfoExportRequest) {
@ -155,6 +161,7 @@ public class UdiInfoExportLogController {
//产品信息接口下载（第三方使用）
@Log(title = "产品信息接口下载（第三方使用）")
@GetMapping("/udiwms/basic/products/download")
public BaseResponse downloadProducts(FilterUdiInfoRequest filterUdiInfoRequest,
BindingResult bindingResult) {
@ -194,6 +201,7 @@ public class UdiInfoExportLogController {
}
//产品信息接口查询（第三方使用）
@Log(title = "产品信息接口查询（第三方使用）")
@GetMapping("/udiwms/basic/products/pcFilter")
public BaseResponse pcFilterProducts(FilterUdiInfoRequest filterUdiInfoRequest,
BindingResult bindingResult) {

11
api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java
Unescape Escape View File

@ -3,7 +3,9 @@ package com.glxp.api.admin.controller.basic;
import cn.hutool.core.io.IoUtil;
import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity;
import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity;
import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest;
@ -48,6 +50,7 @@ public class UdiInfoImportLogController {
private static final String TAG = "UdiInfoImportLogControl";
private static final Logger log = LoggerFactory.getLogger(UdiInfoImportLogController.class);
@Log(title = "获取医疗器械信息导入列表信息")
@GetMapping("/udiwms/products/importLog/filter")
public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest,
BindingResult bindingResult) {
@ -65,6 +68,7 @@ public class UdiInfoImportLogController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "获取医疗器械信息导入详情列表信息")
@GetMapping("/udiwms/products/importLog/filterDetail")
public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest,
BindingResult bindingResult) {
@ -82,7 +86,7 @@ public class UdiInfoImportLogController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "删除医疗器械信息导入日志",businessType = BusinessType.DELETE)
@PostMapping("/udiwms/products/importLog/deleteLog")
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -102,6 +106,7 @@ public class UdiInfoImportLogController {
return ResultVOUtils.success("删除成功");
}
@Log(title = "删除医疗器械信息导入日志",businessType = BusinessType.DELETE)
@PostMapping("/udiwms/products/importLog/delete")
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -116,6 +121,7 @@ public class UdiInfoImportLogController {
//产品信息文件导入
@Log(title = "产品信息文件导入")
@PostMapping("/udiwms/products/importLog/upload")
public BaseResponse uploadProducts(@RequestParam("file") List<MultipartFile> files, @RequestParam("thirdSys") String thirdSys) {
String filePath = "D:\\udiwms\\filePath\\";
@ -200,6 +206,7 @@ public class UdiInfoImportLogController {
//产品信息接口上传
@Log(title = "产品信息接口上传")
@PostMapping("/udiwms/basic/products/upload")
public BaseResponse postUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
@ -237,6 +244,7 @@ public class UdiInfoImportLogController {
//扫码精灵产品信息接口上传
@Log(title = "扫码精灵产品信息接口上传")
@PostMapping("/udiwms/basic/products/srUpload")
public BaseResponse postSrUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
@ -273,6 +281,7 @@ public class UdiInfoImportLogController {
}
//供应商平台产品信息下载
@Log(title = "供应商平台产品信息下载")
@GetMapping("/udiwms/products/smp/download")
public BaseResponse downloadSmpUdi(FilterUdiIpLogRequest filterUdiIpLogRequest,
BindingResult bindingResult) {

22
api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -6,7 +6,9 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.config.WebSocketServer;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.dao.basic.UdiRelevanceDao;
import com.glxp.api.admin.entity.basic.*;
@ -89,6 +91,7 @@ public class UdiRelevanceController {
@Resource
UdiRelevanceDao udiRelevanceDao;
@Log(title = "获取UDI关联关系信息")
@AuthRuleAnnotation("")
@GetMapping("/udi/udirel/download")
public BaseResponse downloadProducts(FilterUdiInfoRequest filterUdiInfoRequest,
@ -108,6 +111,7 @@ public class UdiRelevanceController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "更具DI获取UDI关联关系信息")
@AuthRuleAnnotation("")
@GetMapping("/udi/udirel/mutil/download")
public BaseResponse downloadMutilProducts(FilterUdiInfoRequest filterUdiInfoRequest,
@ -128,6 +132,7 @@ public class UdiRelevanceController {
//器械信息维护首页
@Log(title = "器械信息维护首页")
@AuthRuleAnnotation("")
@GetMapping("/udi/udirel/filterUdi")
public BaseResponse filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest,
@ -165,6 +170,7 @@ public class UdiRelevanceController {
//供应商器械信息选入
@Log(title = "供应商器械信息选入")
@AuthRuleAnnotation("")
@GetMapping("/udi/udirel/filterSmUdi")
public BaseResponse filterSmUdi(FilterUdiInfoRequest filterUdiInfoRequest,
@ -203,6 +209,7 @@ public class UdiRelevanceController {
//更新下载ERP存货产品
@Log(title = "更新下载ERP存货产品")
@GetMapping("/udi/udirel/updateErp")
public BaseResponse updateErp() {
SystemParamConfigEntity thirdSys = systemParamConfigService.selectByParamKey("erp_updateErpData_thirdSys");
@ -223,6 +230,7 @@ public class UdiRelevanceController {
//多选删除
@Log(title = "多选删除",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/deleteAll")
public BaseResponse deleteAll(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -235,6 +243,7 @@ public class UdiRelevanceController {
return ResultVOUtils.success("删除成功");
}
@Log(title = "根据id删除",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/deleteById")
public BaseResponse deleteById(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -287,6 +296,7 @@ public class UdiRelevanceController {
return ResultVOUtils.success("删除成功");
}
@Log(title = "编辑UDI关联关系",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/update")
public BaseResponse updateRelevanceEntity(@RequestBody UdiRelevanceResponse udiRelevanceResponse, BindingResult bindingResult) {
@ -347,6 +357,7 @@ public class UdiRelevanceController {
//新增或修改关联
@Log(title = "新增或修改关联")
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/check/udi")
public BaseResponse checkUdi(@RequestBody CombineRequest combineRequest) {
@ -366,6 +377,7 @@ public class UdiRelevanceController {
//选入查询结果的所有DI
@Log(title = "选入查询结果的所有DI")
@AuthRuleAnnotation("")
@GetMapping("/udi/udirel/combineAll")
public BaseResponse combineAll(FilterUdiInfoRequest productInfoFilterRequest) {
@ -375,6 +387,7 @@ public class UdiRelevanceController {
//更换关联ERP产品
@Log(title = "更换关联ERP产品")
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/disable")
public BaseResponse disable(@RequestBody CombineRequest combineRequest) {
@ -407,6 +420,7 @@ public class UdiRelevanceController {
//单独选入ERP产品
@Log(title = "单独选入ERP产品",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/addErp")
public BaseResponse addErp(@RequestBody CombineRequest combineRequest) {
@ -424,6 +438,7 @@ public class UdiRelevanceController {
//一键选入ERP产品
@Log(title = "一键选入ERP产品")
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/addAllErp")
public BaseResponse addAllErp(@RequestBody CombineRequest combineRequest) {
@ -438,6 +453,7 @@ public class UdiRelevanceController {
}
//上传产品信息至供应商管理平台
@Log(title = "上传产品信息至供应商管理平台")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/smp/udirl/upload")
public BaseResponse uploadSMP(@RequestBody CombineRequest combineRequest) {
@ -483,6 +499,7 @@ public class UdiRelevanceController {
}
//接收供应商或第三方服务上传产品信息
@Log(title = "接收供应商或第三方服务上传产品信息")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/udirl/thirdSys/upload")
public BaseResponse uploadThirdServcie(@RequestBody PostThirdSysPiRequest postThirdSysPiRequest) {
@ -530,6 +547,7 @@ public class UdiRelevanceController {
}
//获取产品信息详情（多平台）
@Log(title = "获取产品信息详情（多平台）")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/udirel/thirdSys/filter")
public BaseResponse getThirdSysfilter(FilterUdiInfoRequest filterUdiInfoRequest,
@ -562,6 +580,7 @@ public class UdiRelevanceController {
//获取对照过滤列表
@Log(title = "获取对照过滤列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/udirel/thirdSys/detail")
public BaseResponse getThirdSysDetail(FilterUdiInfoRequest filterUdiInfoRequest,
@ -682,6 +701,7 @@ public class UdiRelevanceController {
//解除绑定DI器械信息
@Log(title = "解除绑定DI器械信息",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@GetMapping("/udiwms/udirl/di/remove")
public BaseResponse removeDI(RemoveRelRequest removeRelRequest) {
@ -723,6 +743,7 @@ public class UdiRelevanceController {
}
//获取是否启用供应商维护产品信息
@Log(title = "获取是否启用供应商维护产品信息")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/udiinfo/spcombie")
public BaseResponse getSBCombie() {
@ -730,6 +751,7 @@ public class UdiRelevanceController {
return ResultVOUtils.success(systemParamConfigEntity);
}
@Log(title = "上传第三方服务",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/udirl/lock/status")
public BaseResponse uploadThirdServcie(@RequestBody LockUdiRequest lockUdiRequest) {

29
api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java
Unescape Escape View File

@ -6,6 +6,8 @@ import cn.hutool.core.date.DatePattern;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.dao.inout.OrderDao;
@ -119,7 +121,7 @@ public class StockOrderController {
@Resource
private RedisUtil redisUtil;
@Log(title = "获取单据列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/error")
public BaseResponse listStockOrderNoDealWith(StockOrderFilterRequest stockOrderFilterRequest) {
@ -132,6 +134,7 @@ public class StockOrderController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "上传交易",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/postDealWith")
public BaseResponse postDealWith(@RequestBody StockOrderPostRequest stockOrderPostRequest, BindingResult bindingResult) {
@ -161,6 +164,7 @@ public class StockOrderController {
return ResultVOUtils.success("成功");
}
@Log(title = "新增网页",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/insertWeb")
public BaseResponse insertWeb(@RequestBody StockOrderPostRequest stockOrderPostRequest, BindingResult bindingResult) {
@ -266,6 +270,7 @@ public class StockOrderController {
return ResultVOUtils.success(stockOrderEntity.getBillNo());
}
@Log(title = "删除单据",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/delete")
public BaseResponse deleteOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -281,6 +286,7 @@ public class StockOrderController {
return ResultVOUtils.success("删除成功");
}
@Log(title = "删除错误单据",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/error/delete")
public BaseResponse deleteErrorOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -295,6 +301,7 @@ public class StockOrderController {
return ResultVOUtils.success("删除成功");
}
@Log(title = "获取单据列表信息")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/filter")
public BaseResponse filterOrder(StockOrderFilterRequest stockOrderFilterRequest,
@ -336,6 +343,7 @@ public class StockOrderController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "获取单据详情列表信息")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/filterDetail")
public BaseResponse filterDetail(StockOrderFilterRequest stockOrderFilterRequest,
@ -400,6 +408,7 @@ public class StockOrderController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "提交单据",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/submit")
public BaseResponse submitStockOrder(@RequestParam("id") String id) {
@ -410,6 +419,7 @@ public class StockOrderController {
return ResultVOUtils.success();
}
@Log(title = "提交单据",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/update")
public BaseResponse submitStockOrder(@RequestBody StockOrderEntity stockOrderEntity) {
@ -417,6 +427,7 @@ public class StockOrderController {
return ResultVOUtils.success();
}
@Log(title = "单据流转")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/change")
public BaseResponse stockOrderChange(@RequestBody AddStockOrderChangeRequest addStockOrderChangeRequest) {
@ -487,6 +498,7 @@ public class StockOrderController {
return ResultVOUtils.success();
}
@Log(title = "提交新单据",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/new/submit")
public BaseResponse submitNewStockOrder(@RequestParam("id") String id) {
@ -497,6 +509,7 @@ public class StockOrderController {
return ResultVOUtils.success();
}
@Log(title = "废除提交新单据",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/new/repealSubmit")
public BaseResponse repealSubmitNewStockOrder(@RequestParam("id") String id) {
@ -507,6 +520,7 @@ public class StockOrderController {
return ResultVOUtils.success();
}
@Log(title = "提交单据错误",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/error/submit")
public BaseResponse submitStockOrderError(@RequestParam("id") String id) {
@ -516,12 +530,14 @@ public class StockOrderController {
return ResultVOUtils.success();
}
@Log(title = "提交单据到第三方系统")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/error/submitStockOrderToThirdSys")
public BaseResponse submitStockOrderToThirdSys(@RequestParam("id") String id) {
return stockOrderService.submitOrderToThirdys(id);
}
@Log(title = "生成单据QRCode文本")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/qrcode/generate/text")
public BaseResponse generateStockOrderQRCodeText(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) {
@ -596,6 +612,7 @@ public class StockOrderController {
@Resource
InnerOrderDetailService innerOrderDetailService;
@Log(title = "生成内部单据QRCode文本")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inner/order/generate/text")
public BaseResponse generateInnerOrderQRCodeText(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) {
@ -678,6 +695,7 @@ public class StockOrderController {
return genKey;
}
@Log(title = "生成单据号")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/generateBillNo")
public BaseResponse stockOrderGenerateBillNo(@RequestParam("action") String action) {
@ -693,6 +711,7 @@ public class StockOrderController {
* @param request
* @return
*/
@Log(title = "导出已验收单据数据接口")
@PostMapping("/udiwms/stock/order/exportOrderData")
public BaseResponse exportOrderData(StockOrderFilterRequest request) {
if (null == request || BeanUtil.isEmpty(request)) {
@ -702,6 +721,7 @@ public class StockOrderController {
return ResultVOUtils.success(data);
}
@Log(title = "生成单据号")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/generateBillNoInt")
public BaseResponse generateBillNoInt(@RequestParam("action") String action) {
@ -729,6 +749,7 @@ public class StockOrderController {
* @param billNo
* @return
*/
@Log(title = "撤回已验收单据到未验收状态")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/received/rollback")
public BaseResponse rollbackOrder(String billNo, Integer contrastStatus) {
@ -751,6 +772,7 @@ public class StockOrderController {
}
//未验收单据撤回到等待校验
@Log(title = "未验收单据撤回到等待校验")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/unReceive/rollback")
public BaseResponse rollUnReceivebackOrder(String billNo, Integer contrastStatus) {
@ -766,6 +788,7 @@ public class StockOrderController {
//验收单据
@Log(title = "验收单据")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/accept/getOrder")
public BaseResponse getAcceptOrder(String billNo) {
@ -790,7 +813,7 @@ public class StockOrderController {
}
@Log(title = "接收单据")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/acceptClear")
public BaseResponse acceptClear(@RequestBody AcceptOrderEntity acceptOrderEntity) {
@ -803,7 +826,7 @@ public class StockOrderController {
return ResultVOUtils.success(acceptOrderEntity);
}
@Log(title = "接收添加UDI码")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/accept/addCode")
public BaseResponse acceptAddCode(@RequestBody AcceptOrderEntity acceptOrderEntity) {

22
api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java
Unescape Escape View File

@ -5,6 +5,8 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
@ -86,7 +88,7 @@ public class StockOrderDetailController {
@Resource
SupProductService supProductService;
@Log(title = "获取单据详情列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/filter")
public BaseResponse filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
@ -151,6 +153,7 @@ public class StockOrderDetailController {
return resultList;
}
@Log(title = "获取单据详情列表2")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/filter2")
public BaseResponse filterStockOrderDetail2(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
@ -173,6 +176,7 @@ public class StockOrderDetailController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "获取单据详情临时列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/temp/filter")
public BaseResponse filterStockOrderDetailTemp(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
@ -191,6 +195,7 @@ public class StockOrderDetailController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "获取单据详情")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/getStockOrderDetails")
public BaseResponse getStockOrderDetails(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
@ -209,6 +214,7 @@ public class StockOrderDetailController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "获取单据详情")
@AuthRuleAnnotation("")
@GetMapping(value = "/udiwms/stock/order/detail")
public BaseResponse stockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
@ -225,6 +231,7 @@ public class StockOrderDetailController {
return ResultVOUtils.success(erpOrderEntities);
}
@Log(title = "获取单据上传数量")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/uploadCount")
public BaseResponse uploadCount(@RequestParam("orderId") String orderId, @RequestParam("code") String code) {
@ -273,6 +280,7 @@ public class StockOrderDetailController {
return ResultVOUtils.error(ResultEnum.DATA_NOT);
}
@Log(title = "获取产品信息")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/getInstrument")
public BaseResponse getStockOrderDetailInstrument(@RequestParam("count") String count, @RequestParam("code") String code) {
@ -297,6 +305,7 @@ public class StockOrderDetailController {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品");
}
@Log(title = "根据Id获取产品信息")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/detail/getInstrumentById")
public BaseResponse getStockOrderDetailInstrumentById(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) {
@ -397,6 +406,7 @@ public class StockOrderDetailController {
return false;
}
@Log(title = "通过UDI码新增单据详情",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/addFromCode")
public BaseResponse addStockOrderDetailFromCode(@RequestParam("orderId") String orderId,
@ -441,6 +451,7 @@ public class StockOrderDetailController {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品");
}
@Log(title = "获取产品信息")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/queryProduct")
public BaseResponse queryProduct(@RequestParam("code") String code, @RequestParam("customerId") String customerId) {
@ -480,6 +491,7 @@ public class StockOrderDetailController {
}
@Log(title = "获取产品信息")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/filterProduct")
public BaseResponse filterProduct(FilterUdiInfoRequest filterUdiInfoRequest) {
@ -540,7 +552,7 @@ public class StockOrderDetailController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "获取产品信息")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/inner/order/filterProduct")
public BaseResponse filterBasicProduct(FilterUdiInfoRequest filterUdiInfoRequest) {
@ -574,7 +586,7 @@ public class StockOrderDetailController {
}
@Log(title = "上传数量")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/copy")
public BaseResponse uploadCount(@RequestParam("id") String id) {
@ -590,6 +602,7 @@ public class StockOrderDetailController {
return ResultVOUtils.error(ResultEnum.DATA_NOT);
}
@Log(title = "上传")
@AuthRuleAnnotation("")
@GetMapping(value = "/udiwms/stock/order/detail/upload")
public BaseResponse upload(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
@ -625,6 +638,7 @@ public class StockOrderDetailController {
return ResultVOUtils.error(500, "修改失败");
}
@Log(title = "删除单据详情",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/detail/delete")
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -640,6 +654,7 @@ public class StockOrderDetailController {
}
}
@Log(title = "删除单据详情",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/detail/temp/delete")
public BaseResponse deleteTemp(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -672,6 +687,7 @@ public class StockOrderDetailController {
*
* @return
*/
@Log(title = "更新单据详情信息",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/detail/update")
public BaseResponse updateStockOrderDetail(@RequestBody StockOrderDetailEntity stockOrderDetailEntity) {

2
api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderUploadController.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.glxp.api.admin.controller.business;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.req.business.StockOrderUploadRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
@ -35,6 +36,7 @@ public class StockOrderUploadController {
* @param request
* @return
*/
@Log(title = "查询业务单据上传列表")
@GetMapping("/udiwms/stock/order/upload/filter")
public BaseResponse filter(StockOrderUploadRequest request) {
// 已验收单据才能上传

4
api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderUploadLogController.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.glxp.api.admin.controller.business;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.business.StockOrderUploadLogEntity;
import com.glxp.api.admin.req.business.StockOrderUploadLogRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
@ -30,6 +32,7 @@ public class StockOrderUploadLogController {
* @param request
* @return
*/
@Log(title = "查询日志列表")
@GetMapping("/udiwms/stock/order/uploadLog/filter")
public BaseResponse filter(StockOrderUploadLogRequest request, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
@ -49,6 +52,7 @@ public class StockOrderUploadLogController {
* @param id
* @return
*/
@Log(title = "删除日志",businessType = BusinessType.DELETE)
@GetMapping("/udiwms/stock/order/uploadLog/delete")
public BaseResponse delete(Integer id) {
if (null == id) {

12
api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java
Unescape Escape View File

@ -3,6 +3,8 @@ package com.glxp.api.admin.controller.business;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
@ -98,6 +100,7 @@ public class StockQRCodeTextController {
@Resource
SystemParamConfigService systemParamConfigService;
@Log(title = "获取业务QR码文本信息列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/qrcode/text/filter")
public BaseResponse filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest,
@ -127,6 +130,7 @@ public class StockQRCodeTextController {
}
//-----------打印码
@Log(title = "打印码")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/inspection/stock/qrcode/text/file")
public BaseResponse inspectionStockQRCodeTextPDFFromTemplateFile(
@ -146,6 +150,7 @@ public class StockQRCodeTextController {
return ResultVOUtils.success();
}
@Log(title = "打印PDF模板文件")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/stock/qrcode/text/file")
public BaseResponse stockQRCodeTextPDFFromTemplateFile(
@ -232,6 +237,7 @@ public class StockQRCodeTextController {
}
@Log(title = "打印PDF模板文件")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/stock/qrcode/text/maxfile")
public BaseResponse stockQRCodeMaxTextPDFFromTemplateFile(
@ -315,6 +321,7 @@ public class StockQRCodeTextController {
}
@Log(title = "获取模板")
@AuthRuleAnnotation("")
@GetMapping("/spms/stock/qrcode/filterTemp")
public BaseResponse filterTemp(FilterStPrintTempRequest filterStPrintTempRequest,
@ -344,6 +351,7 @@ public class StockQRCodeTextController {
//-----------打印订单
@Log(title = "打印订单")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/inspection/stock/order/file")
public BaseResponse inspectionStockOrderPDFFromTemplateFile(
@ -369,6 +377,7 @@ public class StockQRCodeTextController {
return ResultVOUtils.success();
}
@Log(title = "打印单PDF模板据文件")
@AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/stock/order/file")
public void stockOrderPDFFromTemplateFile(
@ -556,7 +565,7 @@ public class StockQRCodeTextController {
return null;
}
@Log(title = "文本上传",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@GetMapping(value = "/udiwms/stock/qrcode/text/upload")
public BaseResponse upload(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest,
@ -573,6 +582,7 @@ public class StockQRCodeTextController {
return ResultVOUtils.error(500, "修改失败");
}
@Log(title = "删除",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/qrcode/text/delete")
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {

5
api-admin/src/main/java/com/glxp/api/admin/controller/inout/IOOrderStatusController.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.glxp.api.admin.controller.inout;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.inout.ErpOrderEntity;
import com.glxp.api.admin.entity.inout.IOOrderStatusEntity;
import com.glxp.api.admin.entity.inout.OrderEntity;
@ -37,6 +39,7 @@ public class IOOrderStatusController {
@Resource
private IOOrderStatusService ioOrderStatusService;
@Log(title = "获取出入库单据状态列表")
@GetMapping("spms/inout/order/status")
public BaseResponse listOrderStatus(OrderStatusFilterRequest orderStatusFilterRequest) {
List<IOOrderStatusEntity> orderStatusEntities = ioOrderStatusService.filterOrderStatus(orderStatusFilterRequest);
@ -48,6 +51,7 @@ public class IOOrderStatusController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "根据状态获取出入库单据详情列表")
@GetMapping("spms/inout/order/dlByStatus")
public BaseResponse dlByStatus(OrderStatusFilterRequest orderStatusFilterRequest) {
List<DlOrderResponse> dlOrderResponses = new ArrayList<>();
@ -68,6 +72,7 @@ public class IOOrderStatusController {
}
//更新订单
@Log(title = "更新订单",businessType = BusinessType.DELETE)
@PostMapping("/spms/inout/order/deleteStatus")
public BaseResponse updateStatus(@RequestBody OrderStatusFilterRequest orderStatusFilterRequest,
BindingResult bindingResult) {

5
api-admin/src/main/java/com/glxp/api/admin/controller/inout/IoCodeLostController.java
Unescape Escape View File

@ -3,6 +3,8 @@ package com.glxp.api.admin.controller.inout;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.inout.IoCodeLostEntity;
import com.glxp.api.admin.entity.inout.WarehouseEntity;
import com.glxp.api.admin.res.PageSimpleResponse;
@ -29,6 +31,7 @@ public class IoCodeLostController {
@Resource
IoCodeLostService codeLostService;
@Log(title = "获取扫码缺失字段信息补齐列表")
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/getCodeLost")
public BaseResponse getCodeLost(@RequestBody @Valid IoCodeLostEntity ioCodeLostEntity, BindingResult bindingResult) {
@ -44,6 +47,7 @@ public class IoCodeLostController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "更新扫码缺失字段信息",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/updateCodeLost")
public BaseResponse updateCodeLost(@RequestBody @Valid IoCodeLostEntity ioCodeLostEntity, BindingResult bindingResult) {
@ -102,6 +106,7 @@ public class IoCodeLostController {
//获取验收单据业务详情
@Log(title = "获取验收单据业务详情")
@AuthRuleAnnotation("")
@GetMapping("/warehouse/inout/getTabCode")
public BaseResponse getTabCode(String code) {

26
api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java
Unescape Escape View File

@ -8,6 +8,8 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.controller.inout.utils.DataTransUtil;
@ -117,6 +119,7 @@ public class OrderController {
@Resource
private UdiRelevanceService udiRelevanceService;
@Log(title = "获取udi码")
@AuthRuleAnnotation("")
@GetMapping("udiwms/inout/order/getUdi")
public BaseResponse getUdi(@RequestParam("code") String code) {
@ -125,6 +128,7 @@ public class OrderController {
return ResultVOUtils.success(udiEntity);
}
@Log(title = "根据状态获取单据列表")
@AuthRuleAnnotation("")
@GetMapping("udiwms/inout/order/status")
public BaseResponse listOrderByStatus(OrderFilterRequest orderFilterRequest) {
@ -137,6 +141,7 @@ public class OrderController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "获取单据错误信息")
@AuthRuleAnnotation("")
@GetMapping("udiwms/inout/order/error")
public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) {
@ -157,6 +162,7 @@ public class OrderController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "获取单据重复信息")
@AuthRuleAnnotation("")
@GetMapping("udiwms/inout/order/repeat")
public BaseResponse listOrderRepeat(OrderQueryRequest orderQueryRequest) {
@ -169,6 +175,7 @@ public class OrderController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "删除单据",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("udiwms/inout/order/delete")
public BaseResponse deleteOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -198,7 +205,7 @@ public class OrderController {
return ResultVOUtils.success("删除成功");
}
@Log(title = "更新单据",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/updateOrder")
public BaseResponse updateOrder(@RequestBody OrderEntity orderEntity,
@ -211,7 +218,7 @@ public class OrderController {
return ResultVOUtils.success("更新成功");
}
@Log(title = "更新单元",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/updateUnit")
public BaseResponse updateUnit(@RequestBody @Valid OrderEntity orderEntity,
@ -233,6 +240,7 @@ public class OrderController {
return ResultVOUtils.success("添加成功");
}
@Log(title = "获取单据信息列表")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/order/filter")
public BaseResponse filterOrder(OrderFilterRequest orderFilterRequest,
@ -278,6 +286,7 @@ public class OrderController {
//手持终端下载订单校验
@Log(title = "手持终端下载订单校验")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/order/download")
public BaseResponse downloadOrder(OrderFilterRequest orderFilterRequest,
@ -375,6 +384,7 @@ public class OrderController {
RedisUtil redisUtil;
//手持终端验收完成后，更新订单状态
@Log(title = "手持终端验收完成后，更新订单状态",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/spms/inout/order/check/updateStatus")
public BaseResponse updateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest,
@ -545,6 +555,7 @@ public class OrderController {
}
//前端直接验收完成
@Log(title = "前端直接验收完成")
@AuthRuleAnnotation("")
@PostMapping("/spms/inout/order/web/updateStatus")
public BaseResponse webUpdateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest,
@ -564,7 +575,7 @@ public class OrderController {
return updateReview(authAdmin, updateExportStatusRequest, null);
}
@Log(title = "根据UDI码获取单据信息")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/order/filterCode")
public BaseResponse filterOrderByCode(OrderFilterByCodeRequest orderFilterByCodeRequest,
@ -584,6 +595,7 @@ public class OrderController {
}
//更新订单
@Log(title = "更新订单",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/updateExportStatus")
public BaseResponse updateExportStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest,
@ -601,6 +613,7 @@ public class OrderController {
//导出订单（json)
@Log(title = "导出订单（json)")
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/order/exportXml")
public void exportXml(@RequestBody DeleteRequest deleteRequest, HttpServletResponse res) {
@ -637,6 +650,7 @@ public class OrderController {
// return ResultVOUtils.success("文件生成成功！！");
}
@Log(title = "合并订单")
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/order/mergeOrder")//TODO 合并订单
public BaseResponse mergeOrder(@RequestBody OrderMergeRequest orderMergeRequest, BindingResult bindingResult) {
@ -710,6 +724,7 @@ public class OrderController {
//异常单据撤回
@Log(title = "异常单据撤回")
@AuthRuleAnnotation("")
@GetMapping("/spms/inout/order/revoke")
public BaseResponse revokeOrder(OrderFilterRequest orderFilterRequest,
@ -756,6 +771,7 @@ public class OrderController {
* @param billNo 单据号
* @return
*/
@Log(title = "补单")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/supplementOrder")
public BaseResponse supplementOrder(@RequestParam("billNo") String billNo) {
@ -777,6 +793,7 @@ public class OrderController {
* @param billNo
* @return
*/
@Log(title = "查询单据删除页面数据")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/order/filterOrderForDelete")
public BaseResponse filterOrderForDelete(String billNo) {
@ -791,6 +808,7 @@ public class OrderController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "更新单据信息",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/updateOrderInfo")
public BaseResponse updateOrderInfo(@RequestBody OrderEditRequest orderEditRequest) {
@ -807,6 +825,7 @@ public class OrderController {
* @param id
* @return
*/
@Log(title = "根据扫码单据号查询单据信息")
@GetMapping("/udiwms/inout/order/getOrderById")
public BaseResponse getOrderById(String id) {
if (StrUtil.isBlank(id)) {
@ -816,6 +835,7 @@ public class OrderController {
return ResultVOUtils.success(orderEntity);
}
@Log(title = "上传供应商自助平台")
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/order/uploadSpms")
public BaseResponse uploadSpms(@RequestBody OrderUploadRequest orderUploadRequest, BindingResult bindingResult) {

17
api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java
Unescape Escape View File

@ -5,6 +5,8 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.db.sql.Order;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.controller.inout.utils.CheckOrderUtils;
@ -119,6 +121,7 @@ public class OrderDetailController {
UdiRelevanceService udiRelevanceService;
@Log(title = "获取erp单据信息")
@AuthRuleAnnotation("")
@GetMapping("/spms/erpOrder/filter")
public BaseResponse filterSpmsOrder(FilterOrderRequest filterErpOrderRequest,
@ -167,6 +170,7 @@ public class OrderDetailController {
}
//手持终端下载业务单据
@Log(title = "手持终端下载业务单据")
@AuthRuleAnnotation("")
@GetMapping("/udiwms/erpOrder/filter")
public BaseResponse filterErpOrder(FilterOrderRequest filterErpOrderRequest,
@ -227,7 +231,7 @@ public class OrderDetailController {
@Resource
BasicBusTypeChangeService basicBusTypeChangeService;
@Log(title = "新增业务单据",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@GetMapping("/udiwms/erpOrder/addStockOrder")
public BaseResponse addStockOrder(FilterOrderRequest filterErpOrderRequest,
@ -300,6 +304,7 @@ public class OrderDetailController {
@Resource
InvWarehouseService invWarehouseService;
@Log(title = "新增业务单据",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@GetMapping("/udiwms/receive/addStockOrder")
public BaseResponse addReceiveOrder(FilterOrderRequest filterErpOrderRequest,
@ -374,6 +379,7 @@ public class OrderDetailController {
private ErpOrderClient erpOrderClient;
//只查询第三方单据
@Log(title = "只查询第三方单据")
@GetMapping("/udiwms/thirdOrder/filter")
public BaseResponse filterThirdOrder(FilterOrderRequest filterErpOrderRequest,
BindingResult bindingResult) {
@ -473,7 +479,7 @@ public class OrderDetailController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "更新绑定",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/erpOrder/updateBind")
public BaseResponse updateBind(@RequestBody ErpOrderEntity erpOrderEntity, BindingResult bindingResult) {
@ -492,6 +498,7 @@ public class OrderDetailController {
}
}
@Log(title = "更新绑定供应商",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/erpOrder/updateBindSup")
public BaseResponse updateBindSup(@RequestBody ErpOrderEntity erpOrderEntity, BindingResult bindingResult) {
@ -511,6 +518,7 @@ public class OrderDetailController {
}
}
@Log(title = "获取个人Erp单据信息")
@AuthRuleAnnotation("")
@GetMapping("/warehouse/getMyErpOrders")
public BaseResponse getMyErpOrders(FilterErpOrderRequest filterErpOrderRequest,
@ -531,6 +539,7 @@ public class OrderDetailController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "删除Erp单据",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/warehouse/deleteErpOrder")
public BaseResponse deleteErpOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -546,6 +555,7 @@ public class OrderDetailController {
}
}
@Log(title = "订单详情")
@AuthRuleAnnotation("")
@GetMapping(value = "/warehouse/inout/order/detail")//TODO 订单详情
public BaseResponse orderDetail(FilterErpOrderRequest filterErpOrderRequest,
@ -611,6 +621,7 @@ public class OrderDetailController {
return resultList;
}
@Log(title = "上传单据")
@AuthRuleAnnotation("")
@GetMapping(value = "/warehouse/inout/order/uploadOrder")
public BaseResponse uploadOrder(FilterErpOrderRequest filterErpOrderRequest,
@ -662,6 +673,7 @@ public class OrderDetailController {
}
}
@Log(title = "查询Erp单据信息")
@AuthRuleAnnotation("")
@PostMapping("/warehouse/selectErpOrder")
public BaseResponse selectErpOrder(@RequestBody ImportErpOrderRequest importErpOrderRequest, BindingResult bindingResult) {
@ -763,6 +775,7 @@ public class OrderDetailController {
return ResultVOUtils.success("导入成功");
}
@Log(title = "重新校验")
@AuthRuleAnnotation("")
@PostMapping("/warehouse/repeatPrintCheck")//TODO 重新校验
public BaseResponse repeatPrintCheck(@RequestBody FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) {

5
api-admin/src/main/java/com/glxp/api/admin/controller/inout/UdiTraceController.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.glxp.api.admin.controller.inout;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.entity.basic.UdiEntity;
import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import com.glxp.api.admin.entity.inout.OrderEntity;
@ -47,6 +49,7 @@ public class UdiTraceController {
@Resource
OrderService orderService;
@Log(title = "获取追溯信息列表")
@AuthRuleAnnotation("")
@GetMapping("udiwarehouse/trace/filter")
public BaseResponse list(FilterCodeTraceRequest filterCodeTraceRequest) {
@ -126,7 +129,7 @@ public class UdiTraceController {
}
@Log(title = "获取旧追溯信息")
@AuthRuleAnnotation("")
@GetMapping("udiwarehouse/trace/filterOld")
public BaseResponse filterOld(WarehouseQueryRequest warehouseQueryRequest) {

33
api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
Unescape Escape View File

@ -5,6 +5,8 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.Log;
import com.glxp.api.admin.constant.BusinessType;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.dao.auth.AuthLicenseDao;
@ -111,6 +113,7 @@ public class WareHouseController {
@Resource
private InvBusUserService invBusUserService;
@Log(title = "获取仓库信息列表")
@AuthRuleAnnotation("")
@GetMapping("admin/warehouse/inout/list")
public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) {
@ -129,6 +132,7 @@ public class WareHouseController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "删除条码",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/code/deleteCodes")
public BaseResponse deleteCodes(@RequestBody DeleteCodeRequest deleteCodeRequest, BindingResult bindingResult) {
@ -145,6 +149,7 @@ public class WareHouseController {
return ResultVOUtils.success("删除成功");
}
@Log(title = "根据批次号获取仓库信息")
@AuthRuleAnnotation("")
@GetMapping("admin/warehouse/inout/findByNo")
public BaseResponse findByNo(WarehouseQueryRequest warehouseQueryRequest) {
@ -163,6 +168,7 @@ public class WareHouseController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "根据单据Id获取仓库信息")
@AuthRuleAnnotation("")
@GetMapping("admin/warehouse/inout/findByOrderId")
public BaseResponse findByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
@ -181,6 +187,7 @@ public class WareHouseController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "根据单据Id下载条码")
@AuthRuleAnnotation("")
@GetMapping("spms/inout/dlcode/findByOrderId")
public BaseResponse downloadCodesByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
@ -204,6 +211,7 @@ public class WareHouseController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "根据单据Id获取所有仓库信息")
@AuthRuleAnnotation("")
@GetMapping("admin/warehouse/inout/findAllByOrderId")
public BaseResponse findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
@ -222,6 +230,7 @@ public class WareHouseController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "根据单据Id获取所有仓库错误信息")
@AuthRuleAnnotation("")
@GetMapping("admin/warehouse/inout/findErrorByOrderId")
public BaseResponse findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
@ -237,6 +246,7 @@ public class WareHouseController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "重新提交")
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/commit")//TODO 重新提交
public BaseResponse commitOrder(@RequestBody CommitRequest commitRequest,
@ -255,6 +265,7 @@ public class WareHouseController {
return ResultVOUtils.success("提交成功");
}
@Log(title = "补录提交",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/addCommit")//补录提交
public BaseResponse addCommitOrder(@RequestBody CommitRequest commitRequest,
@ -271,6 +282,7 @@ public class WareHouseController {
return ResultVOUtils.success("提交成功");
}
@Log(title = "提交单据网页",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@GetMapping("warehouse/inout/submitOrderWeb")
public BaseResponse submitOrderWeb(AddOrderRequest orderEntity) {
@ -283,6 +295,7 @@ public class WareHouseController {
return saveOrderWeb(orderEntity);
}
@Log(title = "保存单据网页",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/saveOrderWeb")
public BaseResponse saveOrderWeb(@RequestBody AddOrderRequest addOrderRequest) {
@ -310,7 +323,7 @@ public class WareHouseController {
return ResultVOUtils.success();
}
@Log(title = "保存模板条码",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/saveTempCode")
public BaseResponse saveCode(@RequestBody WarehouseEntity warehouseEntity) {
@ -349,6 +362,7 @@ public class WareHouseController {
else return ResultVOUtils.error(500, "修改失败!");
}
@Log(title = "根据Id删除条码模板",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@GetMapping("warehouse/inout/deleteCodesTempById")
public BaseResponse deleteCodesTempById(@RequestParam("id") Long id) {
@ -369,6 +383,7 @@ public class WareHouseController {
return ResultVOUtils.success();
}
@Log(title = "失效日期核验")
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/expireTimeCheck")
public BaseResponse expireTimeCheck(@RequestBody AddOrderRequest addOrderRequest) {
@ -402,6 +417,7 @@ public class WareHouseController {
}
@Log(title = "输入条码")
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/enterCode")
public BaseResponse addEndterCode(@RequestBody AddEnterCodeRequest addEnterCodeRequest, BindingResult bindingResult) {
@ -596,6 +612,7 @@ public class WareHouseController {
IoCodeLostService codeLostService;
//网页端数据上传调用接口
@Log(title = "网页端数据上传调用接口")
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/addOrderWeb")
public BaseResponse addOrderWeb(@RequestBody AddOrderRequest addOrderRequest, BindingResult bindingResult) {
@ -1098,7 +1115,7 @@ public class WareHouseController {
return null;
}
@Log(title = "更新绑定供应商",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/udiwms/addCode/updateBindSup")
public BaseResponse updateBindSup(@RequestBody WarehouseEntity warehouseEntity, BindingResult bindingResult) {
@ -1125,6 +1142,7 @@ public class WareHouseController {
//网页端数据上传调用接口
@Log(title = "网页端数据上传调用接口")
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/postOrdersWeb")
public BaseResponse postOrdersWeb(@RequestBody PostOrderRequest postOrderRequest, BindingResult bindingResult) {
@ -1144,6 +1162,7 @@ public class WareHouseController {
}
//手持端数据上传调用接口
@Log(title = "手持端数据上传调用接口")
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/postOrders")
public BaseResponse postOrders(@RequestBody PostOrderRequest postOrderRequest, BindingResult bindingResult) {
@ -1196,7 +1215,7 @@ public class WareHouseController {
return ResultVOUtils.success("上传成功，等待后台处理");
}
@Log(title = "保存仓库信息",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("/admin/warehouse/inout/save")
public BaseResponse save(@RequestBody @Valid WarehouseSaveRequest warehouseSaveRequest,
@ -1245,6 +1264,7 @@ public class WareHouseController {
* @param code
* @return
*/
@Log(title = "根据仓位码获取关联用户数据")
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/warehouseUserList")
public BaseResponse getWarehouseUserList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest, BindingResult bindingResult) {
@ -1269,6 +1289,7 @@ public class WareHouseController {
return ResultVOUtils.success(response);
}
@Log(title = "获取仓库单据类型列表")
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/warehouseBussniessTypeList")
public BaseResponse getWarehouseBussniessTypeList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest, BindingResult bindingResult) {
@ -1283,6 +1304,7 @@ public class WareHouseController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Log(title = "保存仓库用户",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/saveWarehouseUser")
public BaseResponse saveWarehouseUser(@RequestBody Map<String, Object> params) {
@ -1321,6 +1343,7 @@ public class WareHouseController {
return ResultVOUtils.success();
}
@Log(title = "保存仓库单据类型",businessType = BusinessType.INSERT)
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/saveWarehouseBussinessType")
public BaseResponse saveWarehouseBussinessType(@RequestBody Map<String, Object> params) {
@ -1362,6 +1385,7 @@ public class WareHouseController {
return ResultVOUtils.success();
}
@Log(title = "更新仓库管理员",businessType = BusinessType.UPDATE)
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/updateDirector")
public BaseResponse updateDirector(WarehouseUserEntity warehouseUserEntity) {
@ -1372,6 +1396,7 @@ public class WareHouseController {
return ResultVOUtils.success();
}
@Log(title = "删除仓库用户",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/delWarehouseUser")
public BaseResponse deleteWarehouseUser(Integer id) {
@ -1391,6 +1416,7 @@ public class WareHouseController {
return ResultVOUtils.success();
}
@Log(title = "删除仓库业务类型",businessType = BusinessType.DELETE)
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/delWarehouseBussinessType")
public BaseResponse deleteWarehouseBussinessType(Integer id) {
@ -1417,6 +1443,7 @@ public class WareHouseController {
*
* @return
*/
@Log(title = "替换单据条码")
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/replaceCodes")
public BaseResponse replaceCodes(@RequestBody CodesReplaceRequest codesReplaceRequest) {

Write Preview
Loading…
Cancel
Save