diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java index f5e320d1..a4962120 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java @@ -95,6 +95,7 @@ public class ConstantStatus { public static final int CORP_TYPE_OUT = 0; //供应商 public static final int CORP_TYPE_INNOR = 1; //内部科室等 public static final int CORP_TYPE_SPECIAL = 3; + public static final int CORP_TYPE_DEPT = 4; //部门 public static final int CORP_SICK_SICK = 1; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptController.java new file mode 100644 index 00000000..bf71a7a0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptController.java @@ -0,0 +1,83 @@ +package com.glxp.api.admin.controller.auth; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.entity.auth.DeptEntity; +import com.glxp.api.admin.req.auth.FilterDeptRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.auth.DeptService; +import com.glxp.api.admin.util.GennerOrderUtils; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +@RestController +public class DeptController { + + + @Resource + private DeptService deptService; + @Resource + private GennerOrderUtils gennerOrderUtils; + + @AuthRuleAnnotation("") + @GetMapping("udi/auth/dept/filter") + public BaseResponse filterList(FilterDeptRequest filterDeptRequest) { + List deptEntityList = deptService.filterDepts(filterDeptRequest); + PageInfo pageInfo = new PageInfo<>(deptEntityList); + PageSimpleResponse deptEntityPageSimpleResponse = new PageSimpleResponse<>(); + deptEntityPageSimpleResponse.setTotal(pageInfo.getTotal()); + deptEntityPageSimpleResponse.setList(deptEntityList); + return ResultVOUtils.success(deptEntityPageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("udi/auth/dept/add") + public BaseResponse addDept(@RequestBody DeptEntity deptEntity) { + deptEntity.setCode(gennerOrderUtils.getDeptCode()); + deptEntity.setUpdateTime(new Date()); + boolean b = deptService.insertDept(deptEntity); + if (b) + return ResultVOUtils.success("添加成功"); + else { + return ResultVOUtils.error(500, "添加失败"); + } + + } + + @AuthRuleAnnotation("") + @PostMapping("udi/auth/dept/update") + public BaseResponse updateDept(@RequestBody DeptEntity deptEntity) { + deptEntity.setUpdateTime(new Date()); + boolean b = deptService.updateDept(deptEntity); + + if (b) + return ResultVOUtils.success("更新成功！"); + else { + return ResultVOUtils.error(500, "更新成功!"); + } + + } + + + @AuthRuleAnnotation("") + @PostMapping("udi/auth/dept/delete") + public BaseResponse deleteDept(@RequestBody DeleteRequest deleteRequest) { + boolean b = deptService.deleteById(Integer.parseInt(deleteRequest.getId())); + if (b) + return ResultVOUtils.success("删除成功"); + else { + return ResultVOUtils.error(500, "删除失败"); + } + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java index db0e858e..9b1fabb1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java @@ -292,7 +292,9 @@ public class StockOrderController { return ResultVOUtils.error(500, "请先选择当前仓库"); } stockOrderFilterRequest.setCorpId(null); - + if (StrUtil.isEmpty(stockOrderFilterRequest.getInvWarehouseCode())) { + return ResultVOUtils.error(500, "当前分库不能为空"); + } stockOrderEntityList = stockOrderService.filterListOr(stockOrderFilterRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(stockOrderEntityList); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index a239a58b..19234647 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -223,6 +223,9 @@ public class OrderController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + if (StrUtil.isEmpty(orderFilterRequest.getInvWarehouseCode())) { + return ResultVOUtils.error(500, "当前分库不能为空"); + } List orderEntityList; if (orderFilterRequest.getStatus() == null || orderFilterRequest.getStatus() == 0) { orderFilterRequest.setStatus(4); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java new file mode 100644 index 00000000..3c6973ba --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java @@ -0,0 +1,132 @@ +package com.glxp.api.admin.controller.inventory; + +import cn.hutool.core.collection.CollUtil; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.api.admin.entity.inventory.InvBusUserEntity; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; +import com.glxp.api.admin.req.inventory.UpdateRelBusRequset; +import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService; +import com.glxp.api.admin.service.inventory.InvBusUserService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +@RestController +public class InvBusUserController { + + + @Resource + InvBusUserService invBusUserService; + + + @Resource + WarehouseBussinessTypeService warehouseBussinessTypeService; + + @AuthRuleAnnotation("") + @GetMapping("spms/bus/user/select/filter") + public BaseResponse filterSelectInvUser(FilterInvBusUserRequest filterInvBusUserRequest) { + List responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest); + List warehouseBussinessTypeEntities = + warehouseBussinessTypeService.getListByCode(filterInvBusUserRequest.getSubInvCode()); + + warehouseBussinessTypeEntities.forEach(warehouseBussinessTypeEntity -> + { + for (InvBusUserEntity invBusUserEntity : responses) { + if (invBusUserEntity.getScAction().equals(warehouseBussinessTypeEntity.getAction())) { + warehouseBussinessTypeEntity.setSelect(true); + break; + } + } + }); + return ResultVOUtils.success(warehouseBussinessTypeEntities); + } + + @AuthRuleAnnotation("") + @PostMapping("/spms/bus/user/warehouse/update") + public BaseResponse updateRes(@RequestBody UpdateRelBusRequset relBusRequset) { + boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); + if (CollUtil.isNotEmpty(relBusRequset.getInvBusUserEntities())) { + relBusRequset.getInvBusUserEntities().forEach(warehouseBussinessTypeEntity -> + { + InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); + invBusUserEntity.setUserId(relBusRequset.getUserId()); + invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode()); + invBusUserEntity.setScAction(warehouseBussinessTypeEntity.getAction()); + invBusUserService.insertInvBusUser(invBusUserEntity); + }); + + } + return ResultVOUtils.success("修改成功！"); + } + + + @AuthRuleAnnotation("") + @GetMapping("spms/bus/user/warehouse/filter") + public BaseResponse filterInvWarehouse(FilterInvBusUserRequest filterInvBusUserRequest) { + List responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest); + return ResultVOUtils.success(responses); + } + + + @AuthRuleAnnotation("") + @PostMapping("/spms/bus/user/warehouse/save") + public BaseResponse save(@RequestBody @Valid InvBusUserEntity invBusUserEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + boolean b = invBusUserService.insertInvBusUser(invBusUserEntity); + + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("添加成功！"); + } + + @AuthRuleAnnotation("") + @PostMapping("/spms/bus/user/warehouse/edit") + public BaseResponse edit(@RequestBody @Valid InvBusUserEntity invBusUserEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (invBusUserEntity.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + boolean b = invBusUserService.updateInvBusUser(invBusUserEntity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("修改成功！"); + } + + @AuthRuleAnnotation("") + @PostMapping("/spms/bus/user/warehouse/delete") + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { + + if (deleteRequest.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + boolean b = invBusUserService.deleteById(deleteRequest.getId()); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success(); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java new file mode 100644 index 00000000..b6c34a88 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.dao.auth; + +import com.glxp.api.admin.entity.auth.DeptEntity; +import com.glxp.api.admin.req.auth.FilterDeptRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface DeptDao { + + + List filterDepts(FilterDeptRequest filterDeptRequest); + + boolean insertDept(DeptEntity deptEntity); + + boolean updateDept(DeptEntity deptEntity); + + + boolean deleteById(Integer id); + + boolean deleteAll(); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvBusUserDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvBusUserDao.java new file mode 100644 index 00000000..90d7e1c4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvBusUserDao.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.dao.inventory; + +import com.glxp.api.admin.entity.inventory.InvBusUserEntity; +import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface InvBusUserDao { + + + List filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); + + boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity); + + boolean updateInvBusUser(InvBusUserEntity InvBusUserEntity); + + boolean deleteById(@Param("id") String id); + + + boolean deleteByUnion(@Param("userId") String userId, @Param("subInvCode") String subInvCode); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthAdmin.java b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthAdmin.java index 52ccad11..326f42f6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthAdmin.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthAdmin.java @@ -29,4 +29,7 @@ public class AuthAdmin { private Integer CustomerId; private String locInvCode; private String locSubInvCode; + + private String dept; + private String deptName; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptEntity.java new file mode 100644 index 00000000..f0d0d8c9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptEntity.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.entity.auth; + +import lombok.Data; + +import java.util.Date; + +@Data +public class DeptEntity { + private String code; + private Integer id; + private String name; + private String remark; + private Integer flag; + private Date updateTime; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseBussinessTypeEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseBussinessTypeEntity.java index 7a2f207f..f65b2c8b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseBussinessTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseBussinessTypeEntity.java @@ -26,4 +26,6 @@ public class WarehouseBussinessTypeEntity { * 业务名称 */ private String name; + + private boolean select; } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvBusUserEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvBusUserEntity.java new file mode 100644 index 00000000..a5cfd92b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvBusUserEntity.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.entity.inventory; + +import lombok.Data; + +@Data +public class InvBusUserEntity { + private Integer id; + private String userId; + private String subInvCode; + private String scAction; + private String remark; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.java index 32389a18..fbcbc992 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.java @@ -36,4 +36,5 @@ public class AuthAdminSaveRequest { private List roles; private String locInvCode; private String locSubInvCode; + private String dept; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterDeptRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterDeptRequest.java new file mode 100644 index 00000000..1c2d8a9b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterDeptRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.req.auth; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterDeptRequest extends ListPageRequest { + private String code; + private String name; + private Integer flag; + private String lastUpdateTime; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvBusUserRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvBusUserRequest.java new file mode 100644 index 00000000..dd59eb38 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvBusUserRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.req.inventory; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterInvBusUserRequest extends ListPageRequest { + + + private String userId; + private String subInvCode; + private String scAction; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/UpdateRelBusRequset.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/UpdateRelBusRequset.java new file mode 100644 index 00000000..096b17ea --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/UpdateRelBusRequset.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.req.inventory; + +import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class UpdateRelBusRequset { + private String userId; + private String subInvCode; + + private List invBusUserEntities; + + +} + diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminResponse.java index 6e5e1598..3b411072 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminResponse.java @@ -37,5 +37,7 @@ public class AuthAdminResponse { private Integer CustomerId; // 角色ids private List roles; + private String dept; + private String deptName; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java index f0f19e66..a50fd89c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.res.basic; import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.entity.auth.DeptEntity; import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity; @@ -34,4 +35,5 @@ public class SpsSyncDataResponse { List warehouseBussinessTypeEntities; List warehouseUserEntities; List authAdminList; + List deptEntityList; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java new file mode 100644 index 00000000..049dbcd7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.service.auth; + + +import com.glxp.api.admin.entity.auth.DeptEntity; +import com.glxp.api.admin.req.auth.FilterDeptRequest; + +import java.util.List; + +public interface DeptService { + + + List filterDepts(FilterDeptRequest filterDeptRequest); + + boolean insertDept(DeptEntity deptEntity); + + boolean updateDept(DeptEntity deptEntity); + + boolean deleteById(Integer id); + + + boolean deleteAll(); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java new file mode 100644 index 00000000..d21690a9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java @@ -0,0 +1,46 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.auth.DeptDao; +import com.glxp.api.admin.entity.auth.DeptEntity; +import com.glxp.api.admin.req.auth.FilterDeptRequest; +import com.glxp.api.admin.service.auth.DeptService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class DeptServiceImpl implements DeptService { + @Resource + DeptDao deptDao; + + @Override + public List filterDepts(FilterDeptRequest filterDeptRequest) { + if (filterDeptRequest.getPage() != null) { + int offset = (filterDeptRequest.getPage() - 1) * filterDeptRequest.getLimit(); + PageHelper.offsetPage(offset, filterDeptRequest.getLimit()); + } + return deptDao.filterDepts(filterDeptRequest); + } + + @Override + public boolean insertDept(DeptEntity deptEntity) { + return deptDao.insertDept(deptEntity); + } + + @Override + public boolean updateDept(DeptEntity deptEntity) { + return deptDao.updateDept(deptEntity); + } + + @Override + public boolean deleteById(Integer id) { + return deptDao.deleteById(id); + } + + @Override + public boolean deleteAll() { + return deptDao.deleteAll(); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvBusUserService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvBusUserService.java new file mode 100644 index 00000000..3c32733e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvBusUserService.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.service.inventory; + + +import com.glxp.api.admin.entity.inventory.InvBusUserEntity; +import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; + +import java.util.List; + +public interface InvBusUserService { + + List filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); + + boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity); + + boolean updateInvBusUser(InvBusUserEntity InvBusUserEntity); + + boolean deleteById(String id); + + boolean deleteByUnion(String userId, String subInvCode); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvBusUserServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvBusUserServiceImpl.java new file mode 100644 index 00000000..f1d2d148 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvBusUserServiceImpl.java @@ -0,0 +1,47 @@ +package com.glxp.api.admin.service.inventory.impl; + +import com.glxp.api.admin.dao.inventory.InvBusUserDao; +import com.glxp.api.admin.entity.inventory.InvBusUserEntity; +import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; +import com.glxp.api.admin.service.inventory.InvBusUserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class InvBusUserServiceImpl implements InvBusUserService { + + @Resource + InvBusUserDao invBusUserDao; + + @Override + public List filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest) { + + if (filterInvBusUserRequest == null) { + return Collections.emptyList(); + } + return invBusUserDao.filterInvBusUser(filterInvBusUserRequest); + } + + @Override + public boolean insertInvBusUser(InvBusUserEntity invBusUserEntity) { + return invBusUserDao.insertInvBusUser(invBusUserEntity); + } + + @Override + public boolean updateInvBusUser(InvBusUserEntity invBusUserEntity) { + return invBusUserDao.updateInvBusUser(invBusUserEntity); + } + + @Override + public boolean deleteById(String id) { + return invBusUserDao.deleteById(id); + } + + @Override + public boolean deleteByUnion(String userId, String subInvCode) { + return invBusUserDao.deleteByUnion(userId, subInvCode); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java index e562ea87..ab12b80f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java @@ -16,6 +16,7 @@ import com.glxp.api.admin.dao.thrsys.ThrOrderDao; import com.glxp.api.admin.dao.thrsys.ThrOrderDetailDao; import com.glxp.api.admin.dao.thrsys.ThrProductsDao; import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.entity.auth.DeptEntity; import com.glxp.api.admin.entity.basic.*; import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; @@ -30,6 +31,7 @@ import com.glxp.api.admin.res.basic.SpSyncUdiResponse; import com.glxp.api.admin.res.basic.SpsSyncBusResponse; import com.glxp.api.admin.res.basic.SpsSyncDataResponse; import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; +import com.glxp.api.admin.service.auth.DeptService; import com.glxp.api.admin.service.basic.BasicDownloadService; import com.glxp.api.admin.service.basic.BussinessChangeTypeService; import com.glxp.api.admin.service.basic.BussinessTypeService; @@ -74,6 +76,9 @@ public class DlBasicService { RedisUtil redisUtil; @Resource AuthAdminDao authAdminService; + @Resource + DeptService deptService; + @Resource WarehouseUserDao warehouseUserDao; @@ -311,6 +316,17 @@ public class DlBasicService { remark.append("用户信息：").append(syncDataResponse.getAuthAdminList().size()).append("条\n"); } + //部门信息 + if (CollUtil.isNotEmpty(syncDataResponse.getDeptEntityList())) { + + deptService.deleteAll(); + for (DeptEntity deptEntity : syncDataResponse.getDeptEntityList()) { + deptService.insertDept(deptEntity); + } + remark.append("部门信息：").append(syncDataResponse.getDeptEntityList().size()).append("条\n"); + } + + spGetHttp.postBasicStatus(basicExportStatusEntity.getId()); batchSession.close(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java index bf4e913e..564658d1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java @@ -182,6 +182,7 @@ public class HeartService { && CollUtil.isEmpty(syncDataResponse.getCompanyProductRelevanceEntities()) && CollUtil.isEmpty(syncDataResponse.getUdiRelevanceEntities()) && CollUtil.isEmpty(syncDataResponse.getAuthAdminList()) + && CollUtil.isEmpty(syncDataResponse.getAuthAdminList()) && CollUtil.isEmpty(syncDataResponse.getWarehouseBussinessTypeEntities()) && CollUtil.isEmpty(syncDataResponse.getWarehouseUserEntities()) && CollUtil.isEmpty(syncDataResponse.getInvSubWarehouseEntities())) { @@ -250,6 +251,8 @@ public class HeartService { logs = logs + "第三方业务单据：" + syncDataResponse.getThrOrderEntities().size() + "条\n"; if (CollUtil.isNotEmpty(syncDataResponse.getAuthAdminList())) logs = logs + "系统用户信息：" + syncDataResponse.getAuthAdminList().size() + "条\n"; + if (CollUtil.isNotEmpty(syncDataResponse.getDeptEntityList())) + logs = logs + "部门信息：" + syncDataResponse.getDeptEntityList().size() + "条\n"; basicExportStatusEntity3.setRemark(logs); basicExportStatusEntity3.setUpdateTime(new Date()); basicExportService.updateExportStatus(basicExportStatusEntity3); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java index db291f27..8b099f76 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java @@ -203,8 +203,6 @@ public class OrderSubmitTask implements SchedulingConfigurer { } } } - - } } } @@ -220,8 +218,6 @@ public class OrderSubmitTask implements SchedulingConfigurer { } } } - - return false; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java index daf3df70..626afc44 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java @@ -6,6 +6,7 @@ import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.dao.basic.UdiInfoDao; import com.glxp.api.admin.dao.info.SyncDataSetDao; import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.entity.auth.DeptEntity; import com.glxp.api.admin.entity.basic.*; import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; import com.glxp.api.admin.entity.info.SyncDataSetEntity; @@ -14,6 +15,7 @@ import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.entity.thrsys.*; import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; +import com.glxp.api.admin.req.auth.FilterDeptRequest; import com.glxp.api.admin.req.basic.*; import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inout.OrderQueryRequest; @@ -26,6 +28,7 @@ import com.glxp.api.admin.res.basic.SpsSyncDataResponse; import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; import com.glxp.api.admin.res.info.SyncDataSetResponse; import com.glxp.api.admin.service.auth.AuthAdminService; +import com.glxp.api.admin.service.auth.DeptService; import com.glxp.api.admin.service.basic.*; import com.glxp.api.admin.service.info.CompanyProductRelevanceService; import com.glxp.api.admin.service.info.SyncDataSetService; @@ -73,7 +76,8 @@ public class UpBasicService { SyncDataSetService syncDataSetService; @Resource AuthAdminService authAdminService; - + @Resource + DeptService deptService; @Resource WarehouseBussinessTypeService warehouseBussinessTypeService; @Resource @@ -83,13 +87,6 @@ public class UpBasicService { SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse(); SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); -// -// BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey("AutoUploadAllData"); -// if (basicExportStatusTimeEntity == null) { -// basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); -// basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); -// basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); -// } //仓库字典 if (syncDataSetEntity.isBasicInv()) { @@ -231,6 +228,17 @@ public class UpBasicService { BeanUtils.copyProperties(spsSyncDataRequest, authAdminQueryRequest); List authAdminList = authAdminService.listAdminPage(authAdminQueryRequest); syncDataResponse.setAuthAdminList(authAdminList); + + + //获取部门信息 + FilterDeptRequest filterDeptRequest = new FilterDeptRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterDeptRequest); + List deptEntityList = deptService.filterDepts(filterDeptRequest); + if (CollUtil.isNotEmpty(deptEntityList)) { + filterDeptRequest.setLastUpdateTime(null); + } + deptEntityList = deptService.filterDepts(filterDeptRequest); + syncDataResponse.setDeptEntityList(deptEntityList); } return syncDataResponse; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/GennerOrderUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/GennerOrderUtils.java index 87e8130a..a6904776 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/GennerOrderUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/GennerOrderUtils.java @@ -66,6 +66,21 @@ public class GennerOrderUtils { return sb.toString(); } + private static String completionSerial(String serialPrefix, Long incrementalSerial, + int serialLength) { + StringBuffer sb = new StringBuffer(serialPrefix); + + //需要补0的长度=流水号长度 -当日自增计数长度 + int length = serialLength - String.valueOf(incrementalSerial).length(); + //补零 + for (int i = 0; i < length; i++) { + sb.append("0"); + } + //redis当日自增数 + sb.append(incrementalSerial); + return sb.toString(); + } + /** * 补全随机数 @@ -156,4 +171,11 @@ public class GennerOrderUtils { return Long.parseLong(curTime.substring(1, curTime.length() - 3)) + incrementalSerial; } + + //生成部门编码 + public String getDeptCode() { + Long incrementalSerial = redisUtil.incr("genDeptCode", 1); + return completionSerial("D", incrementalSerial, 4); + } + } diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index 68a0eb48..aaf7a1a3 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -5,7 +5,7 @@ - INSERT INTO auth_user(id,userName,passWord,lastLoginIp, - lastLoginTime,createTime,userFlag,lastModifyTime,employeeName,locInvCode,locSubInvCode) + INSERT INTO + auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag + ,employeeName,CustomerId,lastModifyTime,locInvCode,locSubInvCode,dept) values (#{id},#{userName}, @@ -92,13 +93,13 @@ #{createTime}, #{userFlag,jdbcType=INTEGER}, #{lastModifyTime}, - #{employeeName},#{locInvCode},#{locSubInvCode}) + #{employeeName},#{locInvCode},#{locSubInvCode}, #{dept}) replace INTO auth_user(id, userName, passWord, lastLoginIp, - lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId,locInvCode,locSubInvCode) + lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId,locInvCode,locSubInvCode,dept) values ( #{id}, #{userName}, @@ -111,7 +112,8 @@ #{employeeName}, #{CustomerId}, #{locInvCode}, - #{locSubInvCode} + #{locSubInvCode}, + #{dept} ) @@ -128,6 +130,7 @@ employeeName=#{employeeName}, locInvCode=#{locInvCode}, locSubInvCode=#{locSubInvCode}, + dept=#{dept}, WHERE id=#{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml new file mode 100644 index 00000000..2a679e66 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml @@ -0,0 +1,47 @@ + + + + + + + + + + INSERT INTO auth_dept(`name`, `flag`, `remark`, updateTime, code) + values (#{name}, + #{flag}, + #{remark}, #{updateTime}, #{code}) + + + + UPDATE auth_dept + + `name`=#{name}, + `flag`=#{flag}, + remark=#{remark}, + code=#{code}, + updateTime=#{updateTime}, + + WHERE id=#{id} + + + + delete + from auth_dept + where id = #{id} + + + delete + from auth_dept + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index 1c3da925..aac4b235 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -139,6 +139,7 @@ INNER JOIN inv_warehouse on inv_warehouse_sub.parentId = inv_warehouse.`code` INNER JOIN inv_warehouse_user on inv_warehouse_sub.`code` =inv_warehouse_user.`code` left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action + INNER JOIN inv_bustype_user on inv_warehouse_bussiness_type.action = inv_bustype_user.scAction AND basic_bustype_local.name LIKE concat('%',#{name},'%') diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml index e62384fc..bcab8796 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml @@ -181,6 +181,12 @@ and invWarehouseCode = #{invWarehouseCode} + and + stock_order.billType in + (select basic_bussiness_type.localAction from inv_bustype_user INNER JOIN basic_bussiness_type on + inv_bustype_user.scAction = basic_bussiness_type.action + WHERE userId =#{userId} and invWarehouseCode =#{invWarehouseCode} + GROUP BY inv_bustype_user.id) and createUser = #{createUser} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index e4b9c0c7..9b7394de 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -275,8 +275,15 @@ and invWarehouseCode =#{invWarehouseCode} + and + io_order.action in + (select basic_bussiness_type.action from inv_bustype_user INNER JOIN basic_bussiness_type on + inv_bustype_user.scAction = basic_bussiness_type.action + WHERE userId =#{userId} and invWarehouseCode =#{invWarehouseCode} + GROUP BY inv_bustype_user.id) + group by io_order.id ORDER BY actDate DESC @@ -285,7 +292,10 @@ + select * + FROM inv_bustype_user + + + AND userId = #{userId} + + + AND subInvCode = #{subInvCode} + + + AND scAction = #{scAction} + + + + + + + + + replace + INTO inv_bustype_user + (userId, `subInvCode`, scAction, remark) + values ( + #{userId}, + #{subInvCode}, + #{scAction}, + #{remark} + ) + + + + + DELETE + FROM inv_bustype_user + WHERE id = #{id} + + + + DELETE + FROM inv_bustype_user + WHERE subInvCode = #{subInvCode} + and userId = #{userId} + + + UPDATE inv_bustype_user + + userId=#{userId}, + subInvCode=#{subInvCode}, + parentId=#{parentId}, + scAction=#{scAction}, + remark=#{remark}, + + WHERE id = #{id} + + + \ No newline at end of file