From 1bb94015460af0ca2470800330b6b9c952979e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Sat, 30 May 2026 16:17:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=9131?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReceiptMaterialDetailImpl.java            | 94 ++++++++++---------
 1 file changed, 48 insertions(+), 46 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java
index 795912381..c9c533d42 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java
@@ -519,34 +519,35 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
             for (MaterialMoreDetailDO materialMoreDetailDO : materialMoreDetailList) {
                 String attributeValue = materialMoreDetailDO.getAttributeValue();
                 String batchLabels = materialMoreDetailDO.getBatchLabels();
-                if ("生产日期".equals(batchLabels)) {
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                    Date date = null;
-                    try {
-                        date = sdf.parse(attributeValue);
-                    } catch (ParseException e) {
-                        throw new RuntimeException(e);
-                    }
-                    receiptMaterialDetailDO.setProductionDate(date);
-                } else if ("过期日期".equals(batchLabels)) {
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                    Date date = null;
-                    try {
-                        date = sdf.parse(attributeValue);
-                    } catch (ParseException e) {
-                        throw new RuntimeException(e);
-                    }
-                    receiptMaterialDetailDO.setExpiryDate(date);
-                } else if ("扩展属性4".equals(batchLabels)) {
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                    Date date = null;
-                    try {
-                        date = sdf.parse(attributeValue);
-                    } catch (ParseException e) {
-                        throw new RuntimeException(e);
-                    }
-                    //receiptMaterialDetailDO.setExtAttr4(date);
-                } else if ("饮用日期".equals(batchLabels)) {
+                if (attributeValue != null && batchLabels != null) {
+                    if ("生产日期".equals(batchLabels)) {
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        Date date = null;
+                        try {
+                            date = sdf.parse(attributeValue);
+                        } catch (ParseException e) {
+                            throw new RuntimeException(e);
+                        }
+                        receiptMaterialDetailDO.setProductionDate(date);
+                    } else if ("过期日期".equals(batchLabels)) {
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        Date date = null;
+                        try {
+                            date = sdf.parse(attributeValue);
+                        } catch (ParseException e) {
+                            throw new RuntimeException(e);
+                        }
+                        receiptMaterialDetailDO.setExpiryDate(date);
+                    } else if ("扩展属性4".equals(batchLabels)) {
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        Date date = null;
+                        try {
+                            date = sdf.parse(attributeValue);
+                        } catch (ParseException e) {
+                            throw new RuntimeException(e);
+                        }
+                        //receiptMaterialDetailDO.setExtAttr4(date);
+                    } else if ("饮用日期".equals(batchLabels)) {
 //                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 //                    Date date = null;
 //                    try {
@@ -555,25 +556,26 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
 //                        throw new RuntimeException(e);
 //                    }
 //                    receiptMaterialDetailDO.setInventoryDate(date);
-                } else if ("扩展属性2".equals(batchLabels)) {
-                    receiptMaterialDetailDO.setExtAttr2(attributeValue);
-                } else if ("扩展属性1".equals(batchLabels)) {
-                    receiptMaterialDetailDO.setExtAttr1(attributeValue);
-                } else if ("箱号/卡板号".equals(batchLabels)) {
-                    receiptMaterialDetailDO.setBoxPalletNo(attributeValue);
-                } else if ("Sheet Ref NO's".equals(batchLabels)) {
-                    receiptMaterialDetailDO.setSheetRefNo(attributeValue);
-                } else if ("Batch Ref NO's".equals(batchLabels)) {
-                    receiptMaterialDetailDO.setBatchRefNo(attributeValue);
-                } else if ("存货日期".equals(batchLabels)) {
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                    Date date = null;
-                    try {
-                        date = sdf.parse(attributeValue);
-                    } catch (ParseException e) {
-                        throw new RuntimeException(e);
+                    } else if ("扩展属性2".equals(batchLabels)) {
+                        receiptMaterialDetailDO.setExtAttr2(attributeValue);
+                    } else if ("扩展属性1".equals(batchLabels)) {
+                        receiptMaterialDetailDO.setExtAttr1(attributeValue);
+                    } else if ("箱号/卡板号".equals(batchLabels)) {
+                        receiptMaterialDetailDO.setBoxPalletNo(attributeValue);
+                    } else if ("Sheet Ref NO's".equals(batchLabels)) {
+                        receiptMaterialDetailDO.setSheetRefNo(attributeValue);
+                    } else if ("Batch Ref NO's".equals(batchLabels)) {
+                        receiptMaterialDetailDO.setBatchRefNo(attributeValue);
+                    } else if ("存货日期".equals(batchLabels)) {
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        Date date = null;
+                        try {
+                            date = sdf.parse(attributeValue);
+                        } catch (ParseException e) {
+                            throw new RuntimeException(e);
+                        }
+                        receiptMaterialDetailDO.setInventoryDate(date);
                     }
-                    receiptMaterialDetailDO.setInventoryDate(date);
                 }
             }
         }