From bbddd048ae9016ae89136eb0f108b80ca38ed4f4 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 19:16:32 +0800
Subject: [PATCH] lsh#明细添加计划跟踪号、行号、批次
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 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 56dd1e9..26810ba 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
@@ -177,6 +177,38 @@
return pakin;
}
+ /**
+ * @author Munch D. Luffy
+ * @date 2026/01/23
+ * @description: PDA缁勬嫋鍓嶇疆妫�鏌�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized boolean mergeItemsCheck(WaitPakinParam waitPakin, Long userId) {
+ if (StringUtils.isBlank(waitPakin.getBarcode())) {
+ throw new CoolException("鍙傛暟閿欒锛氭墭鐩樼爜涓虹┖锛侊紒");
+ }
+ WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+ .eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
+ if (!Objects.isNull(pakin)) {
+ throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶缁勬墭鍗曪細" + pakin.getCode() + "浣跨敤锛侊紒");
+ }
+ List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, waitPakin.getBarcode()));
+ if (!locs.isEmpty()) {
+ List<String> locCodes = locs.stream().map(Loc::getCode).collect(Collectors.toList());
+ String join = StringUtils.join(locCodes, ",");
+ throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶搴撲綅锛�" + join + "浣跨敤锛侊紒");
+ }
+
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAIT_PAKIN_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("缂栫爜瑙勫垯閿欒锛� 缂栫爜瑙勫垯銆孲YS_WAIT_PAKIN_CODE銆嶈鍒欐槸涓嶅瓨鍦�");
+ }
+
+ return agvService.AGVBindAndInTaskStart(waitPakin.getBarcode(),waitPakin.getStaNo());
+
+ }
/**
@@ -297,6 +329,8 @@
}
if (waitPakin.getAgvSign()==1) {
agvService.AGVBindAndInTaskStart(waitPakin, userId);
+ } else {
+ agvService.AGVBindAndInTaskStart(waitPakin.getBarcode());
}
return pakin;
--
Gitblit v1.9.1