From 010b967923d4417094c54a59188f64d28cc98456 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 29 Nov 2024 16:56:00 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E5=92=8C=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E4=B8=BB=E8=A1=A8=E6=B2=A1=E6=9C=89=E5=88=B0=E8=B4=A7?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/service/impl/PurchaseOrderServiceImpl.java   | 8 ++++----
 .../purchase/purchaseOrder/addPurchaseStorage.html        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
index 48a4cd3a..420027d8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
@@ -1145,8 +1145,9 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
         //过滤掉通知到货数为0的数据
         List<PurchaseOrderChild> filterPurchaseOrderChildList = purchaseOrderChildList.stream().filter(item -> item.getNotifyArriveNum() != 0).collect(Collectors.toList());
 
-
+        Date arrivedTime = purchaseOrder.getArrivedTime();
         purchaseOrder = purchaseOrderMapper.selectPurchaseOrderById(purchaseOrderId);
+        purchaseOrder.setArrivedTime(arrivedTime);
 
 
         String warehouseStorageCode = redisCache.generateBillNo("RK");
@@ -1275,7 +1276,6 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
         }else {
             warehouseStorageOrder.setNotifyArrivedNum(allNotifyHasArrivedNum + allNotifyArrivedNum);
         }
-        warehouseStorageOrder.setArrivedTime(purchaseOrder.getArrivedTime());
         warehouseStorageOrder.setRelatedOrderCode(purchaseOrder.getPurchaseOrderCode());
         warehouseStorageOrder.setCreateTime(new Date());
         warehouseStorageOrder.setCreateBy(ShiroUtils.getLoginName());
@@ -1307,7 +1307,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
             warehouseStorageOrderDetail.setMaterialPhotourl(purchaseOrderChild.getMaterialPhotourl());
             warehouseStorageOrderDetail.setMaterialType(purchaseOrderChild.getMaterialType());
             warehouseStorageOrderDetail.setMaterialDeptType(purchaseOrderChild.getWarehouseDept());
-            warehouseStorageOrderDetail.setArrivedTime(purchaseOrderChild.getPlanDeliveryTime());
+            warehouseStorageOrderDetail.setArrivedTime(purchaseOrder.getArrivedTime());
             warehouseStorageOrderDetail.setSupplierCode(purchaseOrder.getSupplierCode());
             warehouseStorageOrderDetail.setSupplierName(purchaseOrder.getSupplierName());
             warehouseStorageOrderDetail.setCreateTime(new Date());
@@ -1356,7 +1356,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
             purchaseStorageChild.setMaterialPhotourl(purchaseOrderChild.getMaterialPhotourl());
             purchaseStorageChild.setMaterialType(purchaseOrderChild.getMaterialType());
             purchaseStorageChild.setMaterialDeptType(purchaseOrderChild.getWarehouseDept());
-            purchaseStorageChild.setArrivedTime(purchaseOrderChild.getPlanDeliveryTime());
+            purchaseStorageChild.setArrivedTime(purchaseOrder.getArrivedTime());
             purchaseStorageChild.setSupplierCode(purchaseOrder.getSupplierCode());
             purchaseStorageChild.setSupplierName(purchaseOrder.getSupplierName());
             purchaseStorageChild.setCreateTime(new Date());
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/addPurchaseStorage.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/addPurchaseStorage.html
index 10f62209..52193d56 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/addPurchaseStorage.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/addPurchaseStorage.html
@@ -33,7 +33,7 @@
             <label class="col-sm-3 control-label">到货时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="arrivedTime"  class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    <input name="arrivedTime"  th:value="${#dates.format(purchaseOrder.arrivedTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>