From 27f477ccfa5895ade2f6ff94705b34dd224a951d Mon Sep 17 00:00:00 2001 From: Vayne Date: Wed, 19 Apr 2023 18:03:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=94=B6=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jnpf/arinvoices/controller/ArinvoicesController.java | 9 +++++---- .../jnpf/invoices/controller/InvoicesController.java | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java index 24dd503f..f1540119 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java @@ -169,8 +169,9 @@ public class ArinvoicesController { List poundlistIdList = salesorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); List poundlistEntityList = poundlistService.queryPoundListByIds(poundlistIdList); for (PoundlistEntity poundlistEntity: poundlistEntityList) { - poundlistEntity.setIsInvoicing("1"); - poundlistEntity.setInputDate(new Date()); + poundlistEntity.setSalesStatus("2");//修改磅单状态 + poundlistEntity.setIsExpense("1");//修改销项票状态 + poundlistEntity.setOutputDate(new Date());//修改销项票日期 } poundlistService.updateBatchById(poundlistEntityList); }else { @@ -490,8 +491,8 @@ public class ArinvoicesController { List poundlistIdList = salesorder_item0Service.listObjs(queryWrapper3).stream().map(o -> (String) o).collect(Collectors.toList()); List poundlistEntityList = poundlistService.queryPoundListByIds(poundlistIdList); for (PoundlistEntity poundlistEntity: poundlistEntityList) { - poundlistEntity.setIsInvoicing("1"); - poundlistEntity.setInputDate(new Date()); + poundlistEntity.setIsExpense("1");//修改销项票状态 + poundlistEntity.setOutputDate(new Date());//修改销项票日期 } poundlistService.updateBatchById(poundlistEntityList); }else { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java index 75b3968e..a8c68e24 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java @@ -176,6 +176,7 @@ public class InvoicesController { List poundlistEntityList = purchaseorderitemService.getPoundList(entity.getPurchaseorderId()); if (purchaseorderEntity.getAmount().compareTo(entity.getInvoiceAmount()) == 0) { for (PoundlistEntity poundlistEntity: poundlistEntityList) { + poundlistEntity.setPurchaseStatus("1"); poundlistEntity.setIsInvoicing("1"); poundlistEntity.setInputDate(new Date()); } @@ -509,6 +510,7 @@ public class InvoicesController { List poundlistEntityList = purchaseorderitemService.getPoundList(subentity.getPurchaseorderId()); if (purchaseorderEntity.getAmount().compareTo(entity.getInvoiceAmount()) == 0) { for (PoundlistEntity poundlistEntity: poundlistEntityList) { + poundlistEntity.setPurchaseStatus("1"); poundlistEntity.setIsInvoicing("1"); poundlistEntity.setInputDate(new Date()); }