Showing
4 changed files
with
22 additions
and
9 deletions
| ... | ... | @@ -215,21 +215,18 @@ public class ProcurementBuyoutAccountOrderServiceImpl |
| 215 | 215 | |
| 216 | 216 | @Override |
| 217 | 217 | public List<GetBuyoutSettleDataBo> getSettleOptions() { |
| 218 | - // 可制单的原料结算详情单:审核通过 + 未作废 + 未生成过核算单(收料单审核通过的条件在循环内校验) | |
| 219 | - List<ProcurementMaterialSettleDetail> settles = settleDetailMapper.selectList( | |
| 220 | - Wrappers.lambdaQuery(ProcurementMaterialSettleDetail.class) | |
| 221 | - .eq(ProcurementMaterialSettleDetail::getApprovalStatus, STATUS_PASS) | |
| 222 | - .eq(ProcurementMaterialSettleDetail::getDeleted, false) | |
| 223 | - .orderByDesc(ProcurementMaterialSettleDetail::getCreateTime)); | |
| 218 | + // 可制单的原料结算详情单:审核通过 + 未作废 + 数据权限按分厂过滤(收料单审核通过的条件在循环内校验) | |
| 219 | + List<ProcurementMaterialSettleDetail> settles = settleDetailMapper.querySettleOptions(); | |
| 224 | 220 | if (CollectionUtil.isEmpty(settles)) { |
| 225 | 221 | return new ArrayList<>(); |
| 226 | 222 | } |
| 227 | 223 | |
| 228 | 224 | Set<String> usedSettleIds = new HashSet<>(); |
| 229 | - // 已生成过买断入库核算单的结算详情单ID集合 | |
| 225 | + // 已生成过有效买断入库核算单的结算详情单ID集合(已取消的核算单算失效数据,不占用,其结算详情单可再次被选择) | |
| 230 | 226 | List<ProcurementBuyoutAccountOrder> usedOrders = this.list( |
| 231 | 227 | Wrappers.lambdaQuery(ProcurementBuyoutAccountOrder.class) |
| 232 | 228 | .eq(ProcurementBuyoutAccountOrder::getDeleted, false) |
| 229 | + .ne(ProcurementBuyoutAccountOrder::getApprovalStatus, STATUS_CANCEL) | |
| 233 | 230 | .in(ProcurementBuyoutAccountOrder::getSettleDetailId, |
| 234 | 231 | settles.stream().map(ProcurementMaterialSettleDetail::getId).collect(Collectors.toList()))); |
| 235 | 232 | if (CollectionUtil.isNotEmpty(usedOrders)) { | ... | ... |
| ... | ... | @@ -44,6 +44,14 @@ public interface ProcurementMaterialSettleDetailMapper |
| 44 | 44 | List<GetMaterialSettlePlanLineOptionBo> queryPlanLineOptions(@Param("planId") String planId); |
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | + * 可制单的原料结算详情单(审核通过 + 未作废,数据权限按分厂过滤) | |
| 48 | + */ | |
| 49 | + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = { | |
| 50 | + @DataPermission(template = "order", alias = "tb") | |
| 51 | + }) | |
| 52 | + List<ProcurementMaterialSettleDetail> querySettleOptions(); | |
| 53 | + | |
| 54 | + /** | |
| 47 | 55 | * 单条查询(联表带出分厂编号 workshopCode;实体传给流程引擎/分厂审核节点路由前必须用此方法) |
| 48 | 56 | */ |
| 49 | 57 | ProcurementMaterialSettleDetail findById(@Param("id") String id); | ... | ... |
| ... | ... | @@ -161,7 +161,7 @@ |
| 161 | 161 | <result column="diff_amount" property="diffAmount"/> |
| 162 | 162 | </resultMap> |
| 163 | 163 | |
| 164 | - <!-- 汇总导出:审核通过的核算单明细平铺(同单多行连续),按分厂code→采购处code→创建时间正序排序 --> | |
| 164 | + <!-- 汇总导出:非取消状态的核算单明细平铺(同单多行连续),按分厂code→采购处code→创建时间正序排序 --> | |
| 165 | 165 | <select id="querySummary" resultMap="BuyoutAccountSummaryResult"> |
| 166 | 166 | SELECT |
| 167 | 167 | tb.id AS order_id, |
| ... | ... | @@ -180,7 +180,7 @@ |
| 180 | 180 | LEFT JOIN base_data_workshop ws ON ws.id = tb.workshop_id |
| 181 | 181 | LEFT JOIN sys_dept sd ON sd.id = tb.purchase_department_id |
| 182 | 182 | WHERE tb.deleted = 0 |
| 183 | - AND tb.approval_status = 'PASS' | |
| 183 | + AND tb.approval_status != 'CANCEL' | |
| 184 | 184 | AND YEAR(tb.create_time) = #{year} |
| 185 | 185 | AND MONTH(tb.create_time) = #{month} |
| 186 | 186 | ORDER BY | ... | ... |
| ... | ... | @@ -140,6 +140,14 @@ |
| 140 | 140 | WHERE tb.id = #{id} |
| 141 | 141 | </select> |
| 142 | 142 | |
| 143 | + <!-- 可制单的原料结算详情单(审核通过 + 未作废,数据权限按分厂过滤,供买断入库核算单制单下拉用) --> | |
| 144 | + <select id="querySettleOptions" resultMap="ProcurementMaterialSettleDetailResult"> | |
| 145 | + <include refid="PMSD_sql"/> | |
| 146 | + WHERE tb.deleted = 0 | |
| 147 | + AND tb.approval_status = 'PASS' | |
| 148 | + ORDER BY tb.create_time DESC | |
| 149 | + </select> | |
| 150 | + | |
| 143 | 151 | <resultMap id="MaterialSettleSelectableTicketResult" |
| 144 | 152 | type="com.lframework.xingyun.sc.bo.procurement.GetMaterialSettleSelectableTicketBo"> |
| 145 | 153 | <id column="id" property="id"/> | ... | ... |