From ced0680ba99bb04287aa0ce1f31c6fbfed0553d3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 十一月 2025 09:39:37 +0800
Subject: [PATCH] 添加换绑功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 1 -
rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java | 8 ++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java | 1 -
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 11 +++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 28 ++++++++++++++++++++++++++++
5 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
index 1e287d7..dc67735 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -14,6 +14,7 @@
import java.util.List;
import java.util.Map;
+import java.util.Objects;
@Api(tags = "PDA鍑哄簱鎿嶄綔鎺ュ彛")
@RequestMapping("/pda")
@@ -77,6 +78,16 @@
return pdaOutStockService.saveWavePick(containerWaveParam,getLoginUserId());
}
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/task/items")
+ @ApiOperation("鏌ヨ鍑哄簱浠诲姟鎷ｈ揣鏄庣粏")
+ public R getTaskItem(@RequestBody Map<String, String> params) {
+ if (Objects.isNull(params.get("barcode"))) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌�");
+ }
+ return pdaOutStockService.getTaskItems(params);
+ }
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java
index 8224bca..2891647 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java
@@ -34,4 +34,12 @@
* @version 1.0
*/
R wavePickItems(WavePickItemsParams items);
+
+ /**
+ * @author Ryan
+ * @date 2025/11/19
+ * @description: 鑾峰彇鎷ｈ揣鏄庣粏
+ * @version 1.0
+ */
+ R getTaskItems(Map<String, String> params);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 480c998..fa3620b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -8,6 +8,7 @@
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.entity.params.WavePickItemsParams;
import com.vincent.rsf.server.api.service.PdaOutStockService;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.TaskStsType;
@@ -335,6 +336,33 @@
return R.ok();
}
+ /**
+ * @author Ryan
+ * @date 2025/11/19
+ * @description: 鑾峰彇鍑哄簱浠诲姟鎷ｈ揣鏄庣粏
+ * @version 1.0
+ */
+ @Override
+ public R getTaskItems(Map<String, String> params) {
+ if (Objects.isNull(params.get("barcode"))) {
+ throw new CoolException("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskType, TaskType.TASK_TYPE_OUT.type)
+ .eq(Task::getBarcode, params.get("barcode")), false);
+ if (Objects.isNull(task)) {
+ return R.error("鎵樼洏鎵�鍦ㄤ换鍔′笉瀛樺湪锛侊紒");
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ taskItems.forEach(taskItem -> {
+ if (!Objects.isNull(taskItem.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(taskItem.getFieldsIndex());
+ taskItem.setExtendFields(fields);
+ }
+ });
+ return R.ok().add(taskItems);
+ }
+
/**
* @author Ryan
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
index 7f14c47..a464f60 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -123,7 +123,6 @@
throw new CoolException("璇ユ潯鐮佸凡琚�"+isBarcodeSta.getStationName()+"绔欑粦瀹�");
}
}
-
return waitPakinService.removePakin(Arrays.asList(ids));
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 40086b3..e2cf508 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -514,7 +514,6 @@
throw new CoolException(e.getMessage());
}
-
Double workQty = Math.round((orderItem.getWorkQty() + locItem.getOutQty()) * 100) / 100.0;
orderItem.setUpdateBy(loginUserId).setUpdateTime(new Date()).setWorkQty(workQty);
--
Gitblit v1.9.1