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 39c601fe..c3e60dd5 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 @@ -185,10 +185,15 @@ public class ArinvoicesController { queryWrapper.lambda().select(Salesorder_item0Entity::getPoundlistId); List poundlistIdList = salesorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); List poundlistEntityList = poundlistService.queryPoundListByIds(poundlistIdList); + + Date date1 = new Date(arinvoicesCrForm.getBusinessDate()); + for (PoundlistEntity poundlistEntity: poundlistEntityList) { poundlistEntity.setSalesStatus("2");//修改磅单状态 poundlistEntity.setIsExpense("1");//修改销项票状态 - poundlistEntity.setOutputDate(new Date());//修改销项票日期 + +// poundlistEntity.setOutputDate(new Date());//修改销项票日期 + poundlistEntity.setOutputDate(date1);//修改销项票日期 } 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 966277b1..2b180fb4 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 @@ -197,7 +197,8 @@ public class InvoicesController { for (PoundlistEntity poundlistEntity: poundlistEntityList) { poundlistEntity.setPurchaseStatus("1"); poundlistEntity.setIsInvoicing("1"); - poundlistEntity.setInputDate(new Date()); +// poundlistEntity.setInputDate(new Date()); + poundlistEntity.setInputDate(invoicesCrForm.getBusinessDate()); } poundlistService.updateBatchById(poundlistEntityList); }else {