From f679ac0947417416900ab28308dd3bf235336078 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 三月 2026 13:00:57 +0800
Subject: [PATCH] 描述修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
index 5ecbd6c..34f1dda 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
@@ -263,7 +263,7 @@
/**
* @author Ryan
* @date 2025/11/5
- * @description: 甯屾棩鏃犲崟鎹复鏃剁洏鐐�
+ * @description: 鏃犲崟鎹复鏃剁洏鐐�
* @version 1.0
*/
@Override
@@ -277,8 +277,10 @@
if (null == task) {
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
}
- if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)) {
- return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
+ // 鍏佽WAVE_SEED锛�199锛岀瓑寰呯‘璁�/鐩樼偣涓級鍜孉WAIT锛�196锛岀瓑寰呯‘璁わ級涓ょ鐘舵��
+ if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)
+ && !task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
+ return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁わ紝褰撳墠鐘舵�侊細" + task.getTaskStatus());
}
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
if (Cools.isEmpty(taskItems)) {
@@ -307,7 +309,7 @@
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(map.get("barcode"))) {
- throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ throw new CoolException("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(map.get("matnrs"))) {
throw new CoolException("鏂板鐗╂枡涓嶈兘涓虹┖锛侊紒");
@@ -378,7 +380,7 @@
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(map.get("barcode"))) {
- throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ throw new CoolException("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(map.get("items"))) {
throw new CoolException("鏂板鐗╂枡涓嶈兘涓虹┖锛侊紒");
@@ -390,8 +392,10 @@
if (null == task) {
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
}
- if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)) {
- return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
+ // 鍏佽WAVE_SEED锛�199锛岀瓑寰呯‘璁�/鐩樼偣涓級鍜孉WAIT锛�196锛岀瓑寰呯‘璁わ級涓ょ鐘舵��
+ if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)
+ && !task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
+ return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁わ紝褰撳墠鐘舵�侊細" + task.getTaskStatus());
}
//浠诲姟鍙蜂笉鑳介噸澶嶏紝鐢熸垚鏂颁换鍔″彿涓嬪彂鑷砇CS
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
@@ -442,7 +446,7 @@
ReportParams params = new ReportParams();
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
if (Objects.isNull(taskItems) || taskItems.isEmpty()) {
- throw new CoolException("鎵樼洏鏄庣粏涓虹┖锛�1");
+ throw new CoolException("鏂欑鏄庣粏涓虹┖锛�1");
}
List<ReportDataParam> reportDataParams = new ArrayList<>();
taskItems.forEach(taskItem -> {
--
Gitblit v1.9.1