Commit d7ffcf478991a8e823448dcc62123743e3d4abfe

Authored by 易文鹏
1 parent 75152e65

fix: 历史单据不能重复

src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
... ... @@ -508,7 +508,7 @@ public class RyTask extends BaseController {
508 508  
509 509 for (ShipmentHeader shipmentHeader : shipmentHeaders) {
510 510 try {
511   - //新增库单历史
  511 + //新增库单历史
512 512 shipmentHeaderHistoryService.saveById(String.valueOf(shipmentHeader.getId()), "回传");
513 513 shipmentHeader.setDeleted(true);
514 514 if (!shipmentHeaderService.updateById(shipmentHeader)) {
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java
... ... @@ -130,6 +130,11 @@ public class ReceiptHeaderHistoryService extends ServiceImpl<ReceiptHeaderHistor
130 130 String lastUpdatedBy = receiptHeader.getLastUpdatedBy();
131 131 Date lastUpdated = receiptHeader.getLastUpdated();
132 132  
  133 + String code = receiptHeader.getCode();
  134 + List<ReceiptHeaderHistory> list = list(new LambdaQueryWrapper<ReceiptHeaderHistory>().eq(ReceiptHeaderHistory::getCode, code));
  135 + if (!list.isEmpty()) {
  136 + return;
  137 + }
133 138 ReceiptHeaderHistory receiptHeaderHistory = new ReceiptHeaderHistory();
134 139 BeanUtils.copyProperties(receiptHeader, receiptHeaderHistory);
135 140 if (StringUtils.isNotEmpty(name) && "回传".equals(name)) {
... ...
src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/service/ShipmentHeaderHistoryServiceImpl.java
... ... @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 6 import com.huaheng.common.exception.service.ServiceException;
7 7 import com.huaheng.common.utils.StringUtils;
8 8 import com.huaheng.common.utils.security.ShiroUtils;
  9 +import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
9 10 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
10 11 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
11 12 import com.huaheng.pc.shipment.shipmentDetailHistory.domain.ShipmentDetailHistory;
... ... @@ -52,6 +53,13 @@ public class ShipmentHeaderHistoryServiceImpl extends ServiceImpl&lt;ShipmentHeader
52 53 String createdBy = shipmentHeader.getCreatedBy();
53 54 String lastUpdatedBy = shipmentHeader.getLastUpdatedBy();
54 55 Date lastUpdated = shipmentHeader.getLastUpdated();
  56 +
  57 + String code = shipmentHeader.getCode();
  58 + List<ShipmentHeaderHistory> list = list(new LambdaQueryWrapper<ShipmentHeaderHistory>().eq(ShipmentHeaderHistory::getCode, code));
  59 + if (!list.isEmpty()) {
  60 + return;
  61 + }
  62 +
55 63 ShipmentHeaderHistory shipmentHeaderHistory = new ShipmentHeaderHistory();
56 64  
57 65 BeanUtils.copyProperties(shipmentHeader, shipmentHeaderHistory);
... ...