|
...
|
...
|
@@ -185,6 +185,13 @@ public class ProcurementWeighingTicketServiceImpl |
|
185
|
185
|
throw new DefaultClientException("编号已存在,请重新获取编号后再提交!");
|
|
186
|
186
|
}
|
|
187
|
187
|
entity.setCode(vo.getCode());
|
|
|
188
|
+ // 复磅:类型不新增(复磅单以编号F前缀+关联原单体现),仅校验原单可复磅并记录关联
|
|
|
189
|
+ if (StringUtil.isNotBlank(vo.getOriginWeighingTicketId())) {
|
|
|
190
|
+ assertReweighOrigin(vo.getOriginWeighingTicketId());
|
|
|
191
|
+ entity.setOriginWeighingTicketId(vo.getOriginWeighingTicketId());
|
|
|
192
|
+ entity.setReweighAttachmentFileIds(vo.getReweighAttachmentFileIds());
|
|
|
193
|
+ entity.setReweighAttachmentFileNames(vo.getReweighAttachmentFileNames());
|
|
|
194
|
+ }
|
|
188
|
195
|
entity.setType(StringUtil.isBlank(vo.getType()) ? TYPE_REGULAR : vo.getType());
|
|
189
|
196
|
// 第一次记录货物毛重时间:新增时填写了过磅总重,则以新增时间为准
|
|
190
|
197
|
if (vo.getTotalGrossWeight() != null) {
|
|
...
|
...
|
@@ -260,6 +267,11 @@ public class ProcurementWeighingTicketServiceImpl |
|
260
|
267
|
if (oldEntity.getFirstGrossWeightTime() == null && vo.getTotalGrossWeight() != null) {
|
|
261
|
268
|
updateWrapper.set(ProcurementWeighingTicket::getFirstGrossWeightTime, LocalDateTime.now());
|
|
262
|
269
|
}
|
|
|
270
|
+ //复磅编辑
|
|
|
271
|
+ if (StringUtil.isNotBlank(vo.getOriginWeighingTicketId())) {
|
|
|
272
|
+ updateWrapper.set(ProcurementWeighingTicket::getReweighAttachmentFileIds, vo.getReweighAttachmentFileIds());
|
|
|
273
|
+ updateWrapper.set(ProcurementWeighingTicket::getReweighAttachmentFileNames, vo.getReweighAttachmentFileNames());
|
|
|
274
|
+ }
|
|
263
|
275
|
|
|
264
|
276
|
this.update(updateWrapper);
|
|
265
|
277
|
|
|
...
|
...
|
@@ -328,6 +340,22 @@ public class ProcurementWeighingTicketServiceImpl |
|
328
|
340
|
this.update(Wrappers.lambdaUpdate(ProcurementWeighingTicket.class)
|
|
329
|
341
|
.set(ProcurementWeighingTicket::getApprovalStatus, approvalStatus)
|
|
330
|
342
|
.eq(ProcurementWeighingTicket::getId, id));
|
|
|
343
|
+
|
|
|
344
|
+ // 复磅单审核通过:作废原码单,并重算两单关联采购计划的差值标识
|
|
|
345
|
+ if (STATUS_PASS.equals(approvalStatus) && StringUtil.isNotBlank(entity.getOriginWeighingTicketId())) {
|
|
|
346
|
+ String originId = entity.getOriginWeighingTicketId();
|
|
|
347
|
+ this.update(Wrappers.lambdaUpdate(ProcurementWeighingTicket.class)
|
|
|
348
|
+ .set(ProcurementWeighingTicket::getDeleted, true)
|
|
|
349
|
+ .eq(ProcurementWeighingTicket::getId, originId));
|
|
|
350
|
+
|
|
|
351
|
+ List<String> diffPlanIds = new ArrayList<>(collectPlanIdsByTicketId(originId));
|
|
|
352
|
+ collectPlanIdsByTicketId(id).forEach(planId -> {
|
|
|
353
|
+ if (!diffPlanIds.contains(planId)) {
|
|
|
354
|
+ diffPlanIds.add(planId);
|
|
|
355
|
+ }
|
|
|
356
|
+ });
|
|
|
357
|
+ recalcPlanDiffFlags(diffPlanIds);
|
|
|
358
|
+ }
|
|
331
|
359
|
}
|
|
332
|
360
|
|
|
333
|
361
|
@Override
|
|
...
|
...
|
@@ -691,6 +719,27 @@ public class ProcurementWeighingTicketServiceImpl |
|
691
|
719
|
}
|
|
692
|
720
|
|
|
693
|
721
|
/**
|
|
|
722
|
+ * 复磅原单校验:存在且未作废、非复磅单(不允许复磅的复磅)、无未作废的复磅记录
|
|
|
723
|
+ *
|
|
|
724
|
+ * @return 原过磅码单
|
|
|
725
|
+ */
|
|
|
726
|
+ private ProcurementWeighingTicket assertReweighOrigin(String originId) {
|
|
|
727
|
+ ProcurementWeighingTicket origin = weighingTicketMapper.findById(originId);
|
|
|
728
|
+ if (origin == null || Boolean.TRUE.equals(origin.getDeleted())) {
|
|
|
729
|
+ throw new DefaultClientException("原过磅码单不存在或已作废,无法复磅!");
|
|
|
730
|
+ }
|
|
|
731
|
+ if (StringUtil.isNotBlank(origin.getOriginWeighingTicketId())) {
|
|
|
732
|
+ throw new DefaultClientException("复磅码单不允许再次复磅!");
|
|
|
733
|
+ }
|
|
|
734
|
+ if (this.count(Wrappers.lambdaQuery(ProcurementWeighingTicket.class)
|
|
|
735
|
+ .eq(ProcurementWeighingTicket::getOriginWeighingTicketId, originId)
|
|
|
736
|
+ .eq(ProcurementWeighingTicket::getDeleted, false)) > 0) {
|
|
|
737
|
+ throw new DefaultClientException("该过磅码单已存在复磅记录!");
|
|
|
738
|
+ }
|
|
|
739
|
+ return origin;
|
|
|
740
|
+ }
|
|
|
741
|
+
|
|
|
742
|
+ /**
|
|
694
|
743
|
* 追加附件(多次上传累加,保持顺序去重)
|
|
695
|
744
|
*/
|
|
696
|
745
|
private String appendFiles(String oldValues, String newValues) {
|
...
|
...
|
|