From 94adcba059db5ef0c4467082df5666718500d0df Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Tue, 13 Sep 2022 22:53:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=85=A5=E5=BA=93=E6=97=B6=E5=AF=B9?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6=E9=97=B4=E5=81=9A=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E5=A4=84=E7=90=86=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E5=8D=95=E6=8D=AE=E4=B8=8A=E6=B2=A1=E6=9C=89=E7=BB=99?=
 =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=97=A5=E6=9C=9F=EF=BC=8C=E5=88=99?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ktg/mes/wm/service/impl/WmTransactionServiceImpl.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmTransactionServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmTransactionServiceImpl.java
index 050d2a8..916422e 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmTransactionServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmTransactionServiceImpl.java
@@ -121,7 +121,12 @@ public class WmTransactionServiceImpl implements IWmTransactionService
             }
             //使用库存事务日期初始化入库日期
             //一般在入库的时候才会涉及到materialStock的新增，出库的时候都是出的现有库存
-            stock.setRecptDate(transaction.getRecptDate());
+            if(StringUtils.isNotNull(transaction.getRecptDate())){
+                stock.setRecptDate(transaction.getRecptDate());
+            }else{
+                stock.setRecptDate(new Date());
+            }
+
             //使用库存事务上的生产工单初始化库存记录上的生产工单，以支持某些情况下库存需要标记生产工单的情况
             if(StringUtils.isNotNull(transaction.getWorkorderId())){
                 stock.setWorkorderId(transaction.getWorkorderId());