From 786fccc26cb790d75be1d95077675163699abcf3 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 12 一月 2026 13:47:58 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 988d27a..fe137f7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -1,9 +1,6 @@
package com.vincent.rsf.server.manager.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.PakinItem;
@@ -16,7 +13,6 @@
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -130,7 +126,7 @@
.setUpdateBy(userId)
.setCreateBy(userId)
.setMatnrCode(warehouseAreasItems.getMatnrCode());
- AsnOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
+ WkOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
if (!Objects.isNull(order)) {
pakinItem.setType(null == order.getType() ? null : order.getType())
.setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
@@ -146,7 +142,6 @@
}
}
items.add(pakinItem);
-
}
Double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
@@ -179,6 +174,22 @@
return pakin;
}
+
+
+ /**
+ * @author Munch D. Luffy
+ * @date 2026/01/09
+ * @description: PDA缁勬嫋鍚庡懠鍙獳GV
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized WaitPakin mergeItemsWcs(WaitPakinParam waitPakin, Long userId) {
+
+
+ return null;
+ }
+
/**
* @param
* @return
--
Gitblit v1.9.1