From 939ccc9c254870ed15cdd485b9d303bbb00a23f2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 28 九月 2025 14:16:27 +0800
Subject: [PATCH] 注释加上上海玻璃公司ip

---
 north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
index a128573..36896a9 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -34,6 +34,7 @@
 import java.sql.SQLOutput;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.*;
 
 @Service
@@ -102,6 +103,11 @@
             if (object.get("decValue") != null) {
                 decValue = Integer.parseInt(object.get("decValue").toString());
             }
+            String createTime = null;
+            if(object.get("createTime")!=null){
+                createTime =  object.get("createTime").toString();
+            }
+
             Log log = new Log();
             log.setOperator(userName);
             log.setOperatorId(userId);
@@ -162,7 +168,7 @@
 
 
                     //娣诲姞鍑哄叆搴撹褰�
-                    finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea);
+                    finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea,createTime);
                     Integer finishedGoodsInventorycount = 0;
                     finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdContainercount(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber(),container);
 
@@ -912,6 +918,8 @@
                     findOrderDetailNumberd(
                             orderDetail.getDeliveryDetail().getOrderId(),
                             orderDetail.getDeliveryDetail().getOrderNumber());
+
+
             //娣诲姞鍑哄叆搴撹褰�
             finishedOperateLogMapper.insertOutFinishedOperateLog(orderDetail,userName,oddNumber,orderDetail.getDeliveryDetail().getBoxNo());
             orderDetailMapper.update(null,

--
Gitblit v1.8.0