Commit a4d69ff91ad544bf60b9833bc718aa29d790c36c

Authored by 房远帅
1 parent 4a3b5d80

采购-入库:权限

... ... @@ -214,12 +214,8 @@ public class ProcurementWarehouseReceiveOrderServiceImpl
214 214
215 215 @Override
216 216 public List<GetWarehouseReceiveSettleDataBo> getSettleOptions() {
217   - // 可制单的原料结算详情单:审核通过且未生成过仓库收料单
218   - List<ProcurementMaterialSettleDetail> settles = settleDetailMapper.selectList(
219   - Wrappers.lambdaQuery(ProcurementMaterialSettleDetail.class)
220   - .eq(ProcurementMaterialSettleDetail::getApprovalStatus, STATUS_PASS)
221   - .eq(ProcurementMaterialSettleDetail::getDeleted, false)
222   - .orderByDesc(ProcurementMaterialSettleDetail::getCreateTime));
  217 + // 可制单的原料结算详情单:审核通过 + 未作废 + 数据权限按分厂过滤,且未生成过仓库收料单
  218 + List<ProcurementMaterialSettleDetail> settles = settleDetailMapper.querySettleOptions();
223 219 if (CollectionUtil.isEmpty(settles)) {
224 220 return new ArrayList<>();
225 221 }
... ...
... ... @@ -28,6 +28,9 @@ public interface ProcurementAssayApplyMapper extends BaseMapper<ProcurementAssay
28 28 /**
29 29 * 分页查询可送样化验的过磅码单(审核通过且已上传签字凭证,选择码单弹窗)
30 30 */
  31 + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
  32 + @DataPermission(template = "order", alias = "tb")
  33 + })
31 34 List<GetAssaySelectableTicketBo> querySelectableTickets(
32 35 @Param("vo") QueryAssaySelectableTicketVo vo);
33 36 }
... ...