From 1769107c38d40f7d209a48ab7752fe27a81b9709 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 14 四月 2026 17:48:18 +0800
Subject: [PATCH] fix:1.出库台账(删除出库记录查询结果有误)增加批号和供应商 2.出入库不合格管理加批号和供应商 3.发货以及发货记录(部分发货)
---
src/main/java/com/ruoyi/common/utils/DateUtils.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/DateUtils.java b/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 04c87d8..0fa7e5a 100644
--- a/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -43,6 +43,15 @@
return new Date();
}
+ public static LocalDate toLocalDate(Date date){
+ if(date == null) return LocalDate.now();
+ // 2. 鎸囧畾鍥哄畾鏃跺尯杞崲锛堝涓滃叓鍖篣TC+8銆乁TC闆舵椂鍖猴級
+ return date.toInstant()
+ .atZone(ZoneId.of("Asia/Shanghai")) // 涓滃叓鍖猴紙鍖椾含/涓婃捣鏃跺尯锛�
+ // .atZone(ZoneId.of("UTC")) // 鍙�夛細UTC闆舵椂鍖�
+ .toLocalDate();
+ }
+
/**
* 鑾峰彇褰撳墠鏃ユ湡, 榛樿鏍煎紡涓簓yyy-MM-dd
*
@@ -147,7 +156,7 @@
/**
* 璁＄畻鏃堕棿宸�
*
- * @param endTime 鏈�鍚庢椂闂�
+ * @param endDate 鏈�鍚庢椂闂�
* @param startTime 寮�濮嬫椂闂�
* @return 鏃堕棿宸紙澶�/灏忔椂/鍒嗛挓锛�
*/
--
Gitblit v1.9.3