diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java index 676d86688..187e7a28c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java @@ -11,6 +11,10 @@ import lombok.Getter; public enum MesApprovalRecordBizTypeEnum { OEM_STATEMENT("外协结算校对/审核"), + WMS_EXTRA_PLAN("仓库额外计划审批"), + TOOL_PLAN_APPLY_AUDIT("工装计划申报审批"), + TEAM_GROUP_PROCESS_AUDIT("班组提请工艺审批"), + WMS_SCRAP_AUDIT("仓库报废审批"), ; private final String desc; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java index b427ed86d..40d9e5b6d 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java @@ -94,18 +94,9 @@ public class StBuyOrderController extends BladeController { @Operation(summary = "分页", description = "传入stBuyOrder") public R> page(StBuyOrderVO stBuyOrder, Query query) { - /* 1. 固定条件：boStatus = NEW_BUILT */ + /* 固定条件：boStatus = NEW_BUILT */ stBuyOrder.setBoStatus(StBuyOrder.BOSTATUS_NEW); - // 3. 权限控制：按角色过滤审批状态 -// BladeUser user = AuthUtil.getUser(); -// String userRoleName = user.getRoleName(); -// stBuyOrder.setUserRoleName(userRoleName); -// if (StrUtil.isNotBlank(userRoleName) && userRoleName.contains("保管员")) { -// // 保管员：可查询审批状态为「审批中」的数据 -// stBuyOrder.setApprovalStatus(StBuyOrder.APPROVAL_STATUS_CHECKING); -// } - IPage pages = stBuyOrderService.selectStBuyOrderPage(Condition.getPage(query), stBuyOrder); return R.data(pages); } @@ -139,12 +130,6 @@ public class StBuyOrderController extends BladeController { query.setAscs("bo_code"); } -// BladeUser user = AuthUtil.getUser(); -// String userRoleName = user.getRoleName(); -// if (StrUtil.isNotBlank(userRoleName) && userRoleName.contains("保管员")) { -// // 保管员：可查询审批状态为「审批中」的数据 -// stBuyOrder.setApprovalStatus(StBuyOrder.APPROVAL_STATUS_CHECKING); -// } IPage pages = stBuyOrderService.selectStoreRequestPage(Condition.getPage(query), stBuyOrder); return R.data(pages); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java index 119b4e7cf..3ab6f5ffd 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java @@ -1,6 +1,5 @@ package org.springblade.wms.controller; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -95,20 +94,7 @@ public class StClassRequestController extends BladeController { @ApiLog("班组提请表 自定义分页") @Operation(summary = "分页", description = "传入stClassRequest") public R> page(StClassRequestVO stClassRequest, Query query) { - /* 1. 数据权限：当前用户工厂 */ - BladeUser user = AuthUtil.getUser(); -// if (user != null && user.getDeptId() != null) { -// stClassRequest.setDeptId(user.getDeptId()); -// } - String userRoleName = user.getRoleName(); - stClassRequest.setUserRoleName(userRoleName); - if (StrUtil.isNotBlank(userRoleName) && userRoleName.contains("rb_craft")) { - // 可查询审批状态为「审批中」的数据 - stClassRequest.setApprovalStatus(StClassRequest.APPROVAL_STATUS_CHECKING); - } - IPage pages = stClassRequestService.selectStClassRequestPage(Condition.getPage(query), stClassRequest); - return R.data(pages); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java index b4d0bc9bb..75bf6cebb 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java @@ -112,21 +112,7 @@ public class StOtherOutRecordController extends BladeController { @ApiLog("其他出库表 自定义分页") @Operation(summary = "分页", description = "传入stOtherOutRecord") public R> page(StOtherOutRecordVO stOtherOutRecord, Query query) { - /* 1. 数据权限：当前用户工厂 */ - BladeUser user = AuthUtil.getUser(); - if (user != null && user.getDeptId() != null) { - stOtherOutRecord.setCreateDept(Long.valueOf(user.getDeptId())); - } - -// String userRoleName = user.getRoleName(); -// stOtherOutRecord.setUserRoleName(userRoleName); -// if (StrUtil.isNotBlank(userRoleName) && userRoleName.contains("rb_craft")) { -// // 工艺员：可查询审批状态为「审批中」的数据 -// stOtherOutRecord.setApprovalStatus(StOtherOutRecord.APPROVAL_STATUS_CHECKING); -// } - IPage pages = stOtherOutRecordService.selectStOtherOutRecordPage(Condition.getPage(query), stOtherOutRecord); - return R.data(pages); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java index 72ea9ff31..73c4c2258 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java @@ -112,11 +112,6 @@ public class StOtherReceiptRecordController extends BladeController { @ApiLog("其他入库表 自定义分页") @Operation(summary = "分页", description = "传入stOtherReceiptRecord") public R> page(StOtherReceiptRecordVO stOtherReceiptRecord, Query query) { - // 1. 数据权限 - BladeUser user = AuthUtil.getUser(); - if (user != null && user.getDeptId() != null) { - stOtherReceiptRecord.setCreateDept(Long.valueOf(user.getDeptId())); - } // 2. 业务校验：必须属于“其他入库” Long sirId = stOtherReceiptRecord.getSirId(); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StTeamRequestController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StTeamRequestController.java index f29d7af23..85866cfee 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StTeamRequestController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StTeamRequestController.java @@ -80,11 +80,7 @@ public class StTeamRequestController { public R> page(StClassRequestVO stClassRequest, Query query) { /* 1. 固定条件：已发布 */ stClassRequest.setCurStatus(StClassRequest.CURSTATUS_RELEASED); - /* 2. 数据权限：当前用户部门 */ - BladeUser user = AuthUtil.getUser(); - if (user != null && user.getDeptId() != null) { - stClassRequest.setDeptId(user.getDeptId()); - } + IPage pages = stClassRequestService.selectStTeamRequestPage(Condition.getPage(query), stClassRequest); return R.data(pages); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.xml index 2d87962bf..fff863f16 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.xml @@ -31,7 +31,8 @@ - + + @@ -57,10 +58,6 @@ AND t.goods_code = #{stClassRequest.goodsCode} - - AND t.approval_status = 0 - - AND t.cur_status = #{stClassRequest.curStatus} @@ -125,8 +122,6 @@ t.is_deleted = 0 AND t.cur_status = 15 - AND t.dept_id = #{stClassRequest.deptId} - AND t.cr_code LIKE '%' || #{stClassRequest.crCode} || '%' diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherReceiptRecordMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherReceiptRecordMapper.xml index c2686dba2..a2c588ce8 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherReceiptRecordMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherReceiptRecordMapper.xml @@ -54,9 +54,7 @@ LEFT JOIN ST_REALTIME_STOCK t6 ON t2.rls_id = t6.id LEFT JOIN blade_user u ON t1.create_user = u.id AND u.is_deleted = 0 WHERE t1.is_deleted = 0 - - AND t1.create_dept = #{stOtherReceiptRecord.createDept} - + AND t2.sir_code LIKE CONCAT(CONCAT('%', #{stOtherReceiptRecord.sirCode}), '%') diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java index c1770ae04..e49042efc 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java @@ -11,8 +11,9 @@ import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum; import org.springblade.desk.common.feign.IMesApprovalRecordClient; -import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity; +import org.springblade.desk.common.pojo.dto.MesApprovalRecordFeignDTO; import org.springblade.erpdata.feign.IErpDataWmsClient; import org.springblade.erpdata.pojo.vo.PurchaseTrackVO; import org.springblade.system.feign.ISysClient; @@ -183,26 +184,13 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl ruser = userClient.userInfoById(buyOrder.getDeclareMan()); - User user1 = ruser.getData(); - approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId().split(",")[0])); - R roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId()); - String roleNameData = roleName.getData(); - approvalRecord.setCurrentRoleName(roleNameData); - approvalRecord.setNextRoleName("厂内核算员"); - //租户ID 000000 - R roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); - String roleId = roleIdResp.getData(); - approvalRecord.setNextRoleId(Long.valueOf(roleId)); - - - - // 启动流程（原逻辑完全保留） -// PfFlowRecServiceImpl.saveStartFlow(buyOrder.getFlowCode(), buyOrder.getBoId(), user); + MesApprovalRecordFeignDTO mesApprovalRecord = new MesApprovalRecordFeignDTO(); + mesApprovalRecord.setBizId(buyOrder.getId()); + mesApprovalRecord.setBizType(MesApprovalRecordBizTypeEnum.WMS_EXTRA_PLAN.getDesc()); + mesApprovalRecord.setApprovalUser(user.getUserId()); + mesApprovalRecord.setApprovalTime(new Date()); + mesApprovalRecordClient.createApproval(mesApprovalRecord); + } } } @@ -223,10 +211,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl roleIdResp = sysClient.getRoleIds("000000", "厂长,副厂长"); - String roleId = roleIdResp.getData(); - - MesApprovalRecordEntity updateRecord = new MesApprovalRecordEntity(); - updateRecord.setBizId(orderId); - updateRecord.setBizType("额外提请审批"); - updateRecord.setOpinion(""); -// updateRecord.setNextRoleId(Long.valueOf(roleId)); - updateRecord.setNextUserName("厂长,副厂长"); - updateRecord.setStatus(Integer.valueOf(approvalResult)); + if (approvalResult == 1) { + MesApprovalRecordFeignDTO mesApprovalRecord = new MesApprovalRecordFeignDTO(); + mesApprovalRecord.setBizId(orderId); + mesApprovalRecord.setBizType(MesApprovalRecordBizTypeEnum.WMS_EXTRA_PLAN.getDesc()); + mesApprovalRecord.setApprovalUser(approver.getUserId()); + mesApprovalRecord.setApprovalTime(new Date()); + mesApprovalRecordClient.passApproval(mesApprovalRecord); + + } else if (approvalResult == 2) { + MesApprovalRecordFeignDTO mesApprovalRecord = new MesApprovalRecordFeignDTO(); + mesApprovalRecord.setBizId(orderId); + mesApprovalRecord.setBizType(MesApprovalRecordBizTypeEnum.WMS_EXTRA_PLAN.getDesc()); + mesApprovalRecord.setApprovalUser(approver.getUserId()); + mesApprovalRecord.setApprovalTime(new Date()); + mesApprovalRecordClient.rejectApproval(mesApprovalRecord); + } -// } else { -// throw new RuntimeException("仅保管员可执行审批操作！"); -// } }else if(buyOrder.getApprovalStatus() == 1){ if (StBuyOrder.APPROVAL_STATUS_SECOND_CHECKED == buyOrder.getApprovalStatus()) { @@ -268,13 +256,23 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl ruser = userClient.userInfoById(ccr.getCrMan()); -// User user1 = ruser.getData(); -// approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId().split(",")[0])); -// R roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId()); -// String roleNameData = roleName.getData(); -// approvalRecord.setCurrentRoleName(roleNameData); -// approvalRecord.setNextRoleName("热表-工艺员"); -// R roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); -// String roleId = roleIdResp.getData(); -// approvalRecord.setNextRoleId(Long.valueOf(roleId)); - approvalRecord.setCurrentUserId(user.getUserId()); - approvalRecord.setCurrentUserName(user.getNickName()); - User ruser = userClient.userInfoById(ccr.getApprover()).getData(); - approvalRecord.setNextUserId(ccr.getApprover()); - approvalRecord.setNextUserName(ruser.getRealName()); - + MesApprovalRecordFeignDTO mesApprovalRecord = new MesApprovalRecordFeignDTO(); + mesApprovalRecord.setBizId(ccr.getId()); + mesApprovalRecord.setBizType(MesApprovalRecordBizTypeEnum.TEAM_GROUP_PROCESS_AUDIT.getDesc()); + mesApprovalRecord.setApprovalUser(user.getUserId()); + mesApprovalRecord.setApprovalTime(new Date()); + mesApprovalRecord.setUserIds(Collections.singletonList(ccr.getApprover())); + mesApprovalRecordClient.createApproval(mesApprovalRecord); } else { // 普通物料：无需审批，状态设为【无需审批】+ 直接发布 @@ -123,14 +111,6 @@ public class StClassRequestServiceImpl extends BaseServiceImpl ruse = userClient.userInfoById(plan.getCreateUser()); - User user1 = ruse.getData(); - approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId().split(",")[0])); - R roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId()); - String roleNameData = roleName.getData(); - approvalRecord.setCurrentRoleName(roleNameData); - approvalRecord.setNextRoleName("厂长,副厂长"); - //租户ID 000000 - R roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); - String roleId = roleIdResp.getData(); -// approvalRecord.setNextRoleId(Long.valueOf(roleId)); + MesApprovalRecordFeignDTO mesApprovalRecord = new MesApprovalRecordFeignDTO(); + mesApprovalRecord.setBizId(plan.getId()); + mesApprovalRecord.setBizType(MesApprovalRecordBizTypeEnum.TOOL_PLAN_APPLY_AUDIT.getDesc()); + mesApprovalRecord.setApprovalUser(AuthUtil.getUser().getUserId()); + mesApprovalRecord.setApprovalTime(new Date()); + mesApprovalRecordClient.createApproval(mesApprovalRecord); } return this.updateBatchById(list); @@ -163,6 +160,13 @@ public class StMoldApplyForServiceImpl extends BaseServiceImpl ruser = userClient.userInfoById(plan.getKeeper()); User keeper = ruser.getData(); @@ -184,6 +188,15 @@ public class StMoldApplyForServiceImpl extends BaseServiceImpl ruser = userClient.userInfoById(stOtherOutRecord.getCreateUser()); -// User user1 = ruser.getData(); -// approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId().split(",")[0])); -// R roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId()); -// String roleNameData = roleName.getData(); -// approvalRecord.setCurrentRoleName(roleNameData); -// approvalRecord.setNextRoleName("热表-工艺员"); -// R roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); -// String roleId = roleIdResp.getData(); -// approvalRecord.setNextRoleId(Long.valueOf(roleId)); - approvalRecord.setCurrentUserId(user.getUserId()); - approvalRecord.setCurrentUserName(user.getNickName()); - User ruser = userClient.userInfoById(stOtherOutRecord.getApprover()).getData(); - approvalRecord.setNextUserId(stOtherOutRecord.getApprover()); - approvalRecord.setNextUserName(ruser.getRealName()); - - + MesApprovalRecordFeignDTO mesApprovalRecord = new MesApprovalRecordFeignDTO(); + mesApprovalRecord.setBizId(stOtherOutRecord.getId()); + mesApprovalRecord.setBizType(MesApprovalRecordBizTypeEnum.WMS_SCRAP_AUDIT.getDesc()); + mesApprovalRecord.setApprovalUser(user.getUserId()); + mesApprovalRecord.setApprovalTime(new Date()); + mesApprovalRecord.setUserIds(Collections.singletonList(stOtherOutRecord.getApprover())); + mesApprovalRecordClient.createApproval(mesApprovalRecord); } @@ -124,18 +112,28 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl