|
...
|
...
|
@@ -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
|
}
|
...
|
...
|
|