From 6732a988fe843cf59f12aae1460fc97fda5408dd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 19:59:10 +0800
Subject: [PATCH] 新增asn单，修改asn单，添加动态字段修改功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 4b6c928..2335a25 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -163,7 +163,7 @@
* @time 2025/4/7 13:28
*/
@Transactional(rollbackFor = Exception.class)
- private void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception{
+ public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception{
AsnOrder orders = params.getOrders();
params.getItems().forEach(item -> {
item.put("asnId", orders.getId());
@@ -217,7 +217,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R completeOrder(Long id, Long loginUserId) {
+ public R completeOrder(Long id, Long loginUserId) {
AsnOrder asnOrder = this.getById(id);
if (Objects.isNull(asnOrder)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦�!!");
@@ -254,7 +254,7 @@
* @time 2025/3/19 19:53
*/
@Transactional(rollbackFor = Exception.class)
- private void operateOrderLogs(AsnOrder asrder) throws Exception{
+ public synchronized void operateOrderLogs(AsnOrder asrder) throws Exception{
if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -272,15 +272,15 @@
// }
AsnOrder order = this.getById(asrder.getId());
AsnOrderLog orderLog = new AsnOrderLog();
- order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
+// order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
BeanUtils.copyProperties(order, orderLog);
orderLog.setId(null);
orderLog.setAsnId(order.getId());
- if (!this.saveOrUpdate(order)) {
- throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
+// if (!this.saveOrUpdate(order)) {
+// throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+// }
+// orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
if (!asnOrderLogService.save(orderLog)) {
throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
}
--
Gitblit v1.9.1