Merge remote-tracking branch 'origin/dev' into dev

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());

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>