From 625c1058066a01d4d6c2f058d2a4cb1211a80576 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 20 六月 2025 08:52:46 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
index fe95e86..fa0028a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -468,6 +468,7 @@
             }
             OrderDetlLog orderDetlLog = new OrderDetlLog();
             BeanUtils.copyProperties(byId, orderDetlLog);
+            orderDetlLog.setId(null);
             orderDetlLog.setQty(order.getWorkQty());
             orderDetlLog.setWorkQty(0.0);
             if (!orderDetlLogService.save(orderDetlLog)) {
@@ -511,6 +512,7 @@
         orderList.forEach(one -> {
             OrderLog orderLog = new OrderLog();
             BeanUtils.copyProperties(one, orderLog);
+            orderLog.setId(null);
             orderLog.setOrderSettle(OrderSettleType.COMPLETE.val());
 
             if (!orderLogService.save(orderLog)) {

--
Gitblit v1.9.1