UPDATE

tongzhonghao
1 parent fdb76b94
Showing 2 changed files with 8 additions and 21 deletions
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
@@ -424,13 +424,15 @@ public class RyTask extends BaseController {
  
         LambdaQueryWrapper<ReceiptHeader> query = Wrappers.lambdaQuery();
         query.eq(ReceiptHeader::getFirstStatus,QuantityConstant.RECEIPT_HEADER_RETURN)
-        .eq(ReceiptHeader::getLastStatus,QuantityConstant.RECEIPT_HEADER_RETURN)
+                .eq(ReceiptHeader::getLastStatus,QuantityConstant.RECEIPT_HEADER_RETURN)
+                .eq(ReceiptHeader::getDeleted, true)
                 .last("LIMIT 10");
         List<ReceiptHeader> receiptHeaders = receiptHeaderService.list(query);
  
         LambdaQueryWrapper<ShipmentHeader> query1 = Wrappers.lambdaQuery();
         query1.eq(ShipmentHeader::getLastStatus,QuantityConstant.RECEIPT_HEADER_RETURN)
                 .eq(ShipmentHeader::getLastStatus,QuantityConstant.RECEIPT_HEADER_RETURN)
+                .eq(ShipmentHeader::getDeleted, false)
                 .last("LIMIT 10");
         List<ShipmentHeader> shipmentHeaders = shipmentHeaderService.list(query1);
  
@@ -438,18 +440,10 @@ public class RyTask extends BaseController {
             try{
                 //新增入库单历史
                 receiptHeaderHistoryService.saveById(String.valueOf(receiptHeader.getId()), "");
-                if (!receiptHeaderService.removeById(receiptHeader)) {
+                receiptHeader.setDeleted(false);
+                if (!receiptHeaderService.updateById(receiptHeader)) {
                     throw new ServiceException("删除头表失败");
                 }
-
-                List<ReceiptDetail> receiptDetails = receiptDetailService.findByReceiptId(receiptHeader.getId());
-                Set<Integer> ids = receiptDetails.stream().map(ReceiptDetail::getId).collect(Collectors.toSet());
-
-                if (ids.size() > 0) {
-                    if (!receiptDetailService.removeByIds(ids)) {
-                        throw new ServiceException("删除明细表失败");
-                    }
-                }
             }catch (Exception e){
                 e.printStackTrace();
             }
@@ -459,18 +453,10 @@ public class RyTask extends BaseController {
             try{
                 //新增入库单历史
                 shipmentHeaderHistoryService.saveById(String.valueOf(shipmentHeader.getId()), "");
-                if (!shipmentHeaderService.removeById(shipmentHeader.getId())) {
+                shipmentHeader.setDeleted(true);
+                if (!shipmentHeaderService.updateById(shipmentHeader)) {
                     throw new ServiceException("删除头表失败");
                 }
-
-                List<ShipmentDetail> receiptDetails = shipmentDetailService.findByHeaderId(shipmentHeader.getId());
-                Set<Integer> ids = receiptDetails.stream().map(ShipmentDetail::getId).collect(Collectors.toSet());
-
-                if (ids.size() > 0) {
-                    if (!shipmentDetailService.removeByIds(ids)) {
-                        throw new ServiceException("删除明细表失败");
-                    }
-                }
             }catch (Exception e){
                 e.printStackTrace();
             }
@@ -99,6 +99,7 @@ public class ReceiptHeaderController extends BaseController {
         }
         lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ReceiptHeader::getCreated, createdBegin)
                 .le(StringUtils.isNotEmpty(createdEnd), ReceiptHeader::getCreated, createdEnd)
+                .eq(ReceiptHeader::getDeleted, true)
                 .in(StringUtils.isNotEmpty(receiptHeader.getCompanyCode()), ReceiptHeader::getCompanyCode, receiptHeader.getCompanyCode())
                 .in(StringUtils.isEmpty(receiptHeader.getCompanyCode()), ReceiptHeader::getCompanyCode, ShiroUtils.getCompanyCodeList())
                 .like(StringUtils.isNotEmpty(receiptHeader.getLastUpdatedBy()), ReceiptHeader::getLastUpdatedBy, receiptHeader.getLastUpdatedBy())