From 88e6993dd6922990c8a9c144087e9b76c6435a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 4 Jun 2026 14:57:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReservationStockOutOrderMapper.xml                 |  2 +-
 .../materialInventory/MaterialInventoryApi.java        | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
index 774916ac0..7aee07ef8 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -304,7 +304,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="auditTimeEnd != null and auditTimeEnd != ''">
             and date_format(a.audit_time,'%Y-%m-%d') &lt;= #{auditTimeEnd}
         </if>
-        <if test="needDeclareFlag != null">
+        <if test="needDeclareFlag != null and needDeclareFlag != ''">
             and a.NEED_DECLARE_FLAG = #{needDeclareFlag}
         </if>
         <if test="pushTimeStart != null">
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java
index b9d3b57b3..031f83fce 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java
@@ -87,10 +87,12 @@ public class MaterialInventoryApi extends BaseController {
         materialInventoryDO.setExpiryDateStr(materialInventoryDTO.getExpiryDate());
         materialInventoryDO.setProductionDateStr(materialInventoryDTO.getProductionDate());
         Date updateTime = materialInventoryDTO.getUpdateTime();
-        LocalDateTime localDateTime = updateTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        String dateStr = localDateTime.format(formatter);
-        materialInventoryDO.setUpdateTimeStr(dateStr);
+        if (updateTime != null) {
+            LocalDateTime localDateTime = updateTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            String dateStr = localDateTime.format(formatter);
+            materialInventoryDO.setUpdateTimeStr(dateStr);
+        }
         startPage();
         // 使用带批次属性的查询方法，批次属性值从库存表中获取
         List<MaterialInventoryPO> list = materialInventoryApplicationService.queryListWithBatchAttributes(materialInventoryDO);