From 8c108feba3ae67ce264818739f27e8631e953b0d Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Sat, 1 Jul 2023 14:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E9=A1=B9=E7=A5=A8=E5=92=8C=E9=94=80?=
 =?UTF-8?q?=E9=A1=B9=E7=A5=A8=E4=B8=8E=E4=B8=9A=E5=8A=A1=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E7=9B=B8=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf/arinvoices/controller/ArinvoicesController.java   | 7 ++++++-
 .../java/jnpf/invoices/controller/InvoicesController.java  | 3 ++-
 2 files changed, 8 insertions(+), 2 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 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<String> poundlistIdList = salesorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
                         List<PoundlistEntity> 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 {