From aa7f74849ddde1b998626e53f3c4bafb85f71db9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 十一月 2025 10:53:25 +0800
Subject: [PATCH] 添加换绑功能
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java | 9 ++++
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 | 42 ++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java | 4 ++
4 files changed, 65 insertions(+), 1 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 dc67735..d4ca9e3 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
@@ -5,6 +5,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.manager.entity.TaskItem;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -88,6 +89,16 @@
return pdaOutStockService.getTaskItems(params);
}
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @ApiOperation("娉㈡鍑哄簱鍗曟槑缁嗘崲缁�")
+ @PostMapping("/task/item/update")
+ public R modifyTaskItem(@RequestBody List<TaskItem> items) {
+ if (Objects.isNull(items) || items.isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return pdaOutStockService.modifyTaskItem(items);
+ }
+
}
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 2891647..8e394da 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
@@ -4,6 +4,7 @@
import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.entity.params.WavePickItemsParams;
+import com.vincent.rsf.server.manager.entity.TaskItem;
import java.util.List;
import java.util.Map;
@@ -42,4 +43,12 @@
* @version 1.0
*/
R getTaskItems(Map<String, String> params);
+
+ /**
+ * @author Ryan
+ * @date 2025/11/19
+ * @description: 淇敼鍑哄簱浠诲姟妗ｆ槑缁嗙エ鍙�
+ * @version 1.0
+ */
+ R modifyTaskItem(List<TaskItem> item);
}
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 fa3620b..360de94 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
@@ -347,8 +347,9 @@
if (Objects.isNull(params.get("barcode"))) {
throw new CoolException("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
}
+ List<Integer> integers = Arrays.asList(TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type, TaskType.TASK_TYPE_CHECK_OUT.type);
Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
- .eq(Task::getTaskType, TaskType.TASK_TYPE_OUT.type)
+ .in(Task::getTaskType, integers)
.eq(Task::getBarcode, params.get("barcode")), false);
if (Objects.isNull(task)) {
return R.error("鎵樼洏鎵�鍦ㄤ换鍔′笉瀛樺湪锛侊紒");
@@ -363,6 +364,45 @@
return R.ok().add(taskItems);
}
+ /**
+ * @author Ryan
+ * @date 2025/11/19
+ * @description: 淇敼鍑哄簱浠诲姟妗ｆ槑缁嗙エ鍙�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R modifyTaskItem(List<TaskItem> items) {
+ if (Objects.isNull(items) || items.isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ for (TaskItem item : items) {
+ if (Objects.isNull(item.getCrushNo())) {
+ continue;
+ }
+ TaskItem byId = taskItemService.getById(item.getId());
+ if (!Objects.isNull(byId.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(byId.getFieldsIndex());
+ byId.setExtendFields(fields);
+ }
+ if (byId.getExtendFields().get("crushNo").equals(item.getCrushNo())) {
+ continue;
+ }
+ FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>()
+ .eq(FieldsItem::getValue, item.getCrushNo())
+ .last("limit 1"));
+ if (Objects.isNull(fieldsItem)) {
+ throw new CoolException("搴撳瓨涓嶅瓨鍦�!!");
+ }
+ String uuid = fieldsItem.getUuid();
+ item.setFieldsIndex(uuid).setExtendFields(null);
+ if (!taskItemService.updateById(item)) {
+ throw new CoolException("浠诲姟鏄庣粏淇敼澶辫触");
+ }
+ }
+ return R.ok();
+ }
+
/**
* @author Ryan
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
index 7569030..40aa121 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
@@ -179,6 +179,10 @@
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
+ /**鐜板搧绁ㄥ彿*/
+ @TableField(exist = false)
+ private String crushNo;
+
/**
* 娣诲姞鏃堕棿
*/
--
Gitblit v1.9.1