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 15e41ef09..b4d0cf0ac 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 @@ -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; @@ -119,12 +118,12 @@ public class StOtherOutRecordController extends BladeController { 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); - } +// 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); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.xml index 0cb4e345a..5e6b1e579 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.xml @@ -48,6 +48,7 @@ LEFT JOIN BLADE_USER cu ON maf.create_user = cu.id AND cu.is_deleted = 0 -- 原有基础条件:软删除 WHERE maf.is_deleted = 0 + AND maf.approval_status != 1 AND maf.MAF_TYPE = #{stMoldApplyFor.mafType} diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml index 075ee5ecc..d2f526cb8 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml @@ -72,10 +72,6 @@ AND soor.cr_code LIKE '%' || #{stOtherOutRecord.crCode} || '%' - - AND soor.approval_status = 0 - - AND sir.in_out_date >= TO_DATE(#{stOtherOutRecord.startInOutDate}, 'yyyy-mm-dd') diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java index 2595f4346..926a7eac5 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java @@ -266,7 +266,6 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl