From 714d8ba0d3a83fa802b30deac7cc594813d06d0e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 26 六月 2025 14:46:15 +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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 b82f89a..e9621aa 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
@@ -106,7 +106,9 @@
.setMatnr(orderdetl.getMatnr())
.setDetlId(orderdetl.getDetlId())
.setIoStatus(0)
- .setOrderNo(orderdetl.getOrderNo()).setOrderId(orderdetl.getOrderId()).setStatus(1);
+ .setOrderNo(orderdetl.getOrderNo())
+ .setOrderId(orderdetl.getOrderId())
+ .setStatus(1);
waitPakins.add(waitPakin);
});
@@ -203,6 +205,7 @@
WaitPakinLog pakinLog = new WaitPakinLog();
BeanUtils.copyProperties(waitPakin, pakinLog);
pakinLog.setIoStatus(1);
+ pakinLog.setId(null);
if (!waitPakinLogService.saveOrUpdate(pakinLog)) {
throw new CoolException("缁勬嫋鍘嗗彶妗ｆ洿鏂板け璐�");
}
@@ -223,6 +226,7 @@
order.setOrderSettle(OrderSettleType.COMPLETE.val());
OrderLog orderLog = new OrderLog();
BeanUtils.copyProperties(order, orderLog);
+ orderLog.setId(null);
if (!orderLogService.save(orderLog)) {
throw new CoolException("鍘嗗彶鍗曟嵁鏇存柊澶辫触锛侊紒");
}
@@ -240,6 +244,7 @@
BeanUtils.copyProperties(delt, detlLog);
detlLog.setQty(delt.getWorkQty());
detlLog.setWorkQty(0.0);
+ detlLog.setId(null);
detlLogs.add(detlLog);
});
--
Gitblit v1.9.1