diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java index ea332533..fb2bab82 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java @@ -34,6 +34,7 @@ import jnpf.purchaseback.service.PurchaseorderService; import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; import jnpf.purchaseorder.entity.PurchaseorderitemEntity; import jnpf.purchaseorder.service.PurchaseorderitemService; +import jnpf.saleorder.entity.Salesorder_item0Entity; import jnpf.supplier.entity.SupplierEntity; import jnpf.supplier.service.SupplierService; import org.apache.commons.lang3.ObjectUtils; @@ -647,6 +648,18 @@ public class PaymentController { public ActionResult delete(@PathVariable("id") String id){ PaymentEntity entity= paymentService.getInfo(id); if(entity!=null){ + QueryWrapper PaymentdocqueryWrapper = new QueryWrapper<>(); + PaymentdocqueryWrapper.lambda().eq(PaymentdocEntity::getDocumentNo,entity.getPaymentno()); + PaymentdocqueryWrapper.lambda().eq(PaymentdocEntity::getDeleteMark,'0'); + PaymentdocqueryWrapper.lambda().select(PaymentdocEntity::getId); + List paymendocid = paymentdocService.listObjs(PaymentdocqueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); + List paymentdocList = paymentdocService.listByIds(paymendocid); + for (PaymentdocEntity paymentdocEntity: paymentdocList) { + paymentdocEntity.setIsSubmit("0"); + + } + paymentdocService.updateBatchById(paymentdocList); + paymentService.delete(entity); QueryWrapper queryWrapperPayment_item0=new QueryWrapper<>(); queryWrapperPayment_item0.lambda().eq(Payment_item0Entity::getPaymentId,entity.getId());