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 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 @@
- +