diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java index 9e26755b..ab572e97 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java @@ -614,7 +614,7 @@ public class PaymentdocController { paymentService.remove(paymentQueryWrapper); QueryWrapper paymentdocQueryWrapper = new QueryWrapper<>(); paymentdocQueryWrapper.lambda().eq(PaymentdocEntity::getId,entity.getId()); - paymentdocService.remove(paymentdocQueryWrapper); + paymentdocService.delete(entity); } return ActionResult.success("作废成功"); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index 40e0e6e5..958d5788 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -60,6 +60,7 @@ import jnpf.saleback.entity.Saleback_item0Entity; import jnpf.saleorder.entity.Arinvoices_item0soitemEntity; import jnpf.saleorder.entity.SaleorderitemEntity; import jnpf.saleorder.entity.SalesbacksoitemEntity; +import jnpf.saleorder.entity.Salesorder_item0Entity; import jnpf.supplier.entity.SupplierEntity; import jnpf.supplier.service.SupplierService; import jnpf.util.*; @@ -1234,8 +1235,19 @@ public class PurchaseorderController { } QueryWrapper purchaseorder_item0QueryWrapper=new QueryWrapper<>(); purchaseorder_item0QueryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId,entity.getId()); + purchaseorder_item0QueryWrapper.lambda().select(Purchaseorder_item0Entity::getPoundlistId); + + List poundlistIdList = purchaseorder_item0Service.listObjs(purchaseorder_item0QueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); + List poundlistList = poundlistService.listByIds(poundlistIdList); + for (PoundlistEntity poundlistEntity: poundlistList) { +// poundlistEntity.setIsPaymentdoc("0"); +// poundlistEntity.setIsPay("0"); +// poundlistEntity.setPayDate(null); + poundlistService.delete(poundlistEntity); + } purchaseorder_item0Service.remove(purchaseorder_item0QueryWrapper); } + purchaseorderitemService.delete(entity); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java index f5d25116..f22a434b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java @@ -1305,7 +1305,7 @@ public class SaleorderitemController { } } } - saleorderitemService.remove(saleorderitemQueryWrapper); + saleorderitemService.delete(entity); } return ActionResult.success("作废成功");