From 2ec3cec7c35fbe8316cc3d1c7ebfb6a4ae7c8ba6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 05 十一月 2025 17:09:01 +0800
Subject: [PATCH] 添加临时盘点功能
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java | 5 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java | 20 ++++++++++
3 files changed, 109 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
index f4c04ff..eec07b7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
@@ -10,7 +10,9 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
+import java.util.Objects;
@RestController
@RequestMapping("/pda")
@@ -44,6 +46,15 @@
return pdaCheckOrderService.getCheckTaskItemList2(map.get("barcode"));
}
+ @ApiOperation("甯屾棩鏃犲崟鎹复鏃剁洏鐐�")
+ @PostMapping("/check/temp/items")
+ public R tempCheckItem(@RequestBody Map<String, String> map) {
+ if (Objects.isNull(map)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return pdaCheckOrderService.tempCheckItem(map.get("barcode"));
+ }
+
@PreAuthorize("hasAuthority('manager:task:list')")
@GetMapping("/getCheckDiffReasonList")
@ApiOperation("鏌ヨ鐩樼偣宸紓鍘熷洜")
@@ -67,4 +78,13 @@
return pdaCheckOrderService.selectAddMatnr(map);
}
+ @ApiOperation("纭鏂板鐩樼偣鐗╂枡")
+ @PostMapping("/select/matnr/confirm")
+ public R confirmMatnr(@RequestBody Map<String, Object> params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return pdaCheckOrderService.confirmMatnr(params);
+ }
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java
index 13e3339..8473c5a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java
@@ -3,6 +3,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;
+import java.util.List;
import java.util.Map;
public interface PdaCheckOrderService {
@@ -17,4 +18,8 @@
R selectAddMatnr(Map<String, String> map);
R getCheckTaskItemList2(String barcode);
+
+ R tempCheckItem(String barcode);
+
+ R confirmMatnr(Map<String, Object> map);
}
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 e1e6599..f771e81 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
@@ -1,5 +1,7 @@
package com.vincent.rsf.server.api.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.Cools;
@@ -7,6 +9,7 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;
import com.vincent.rsf.server.api.service.PdaCheckOrderService;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.CheckDiffExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -246,4 +249,85 @@
return R.ok(Cools.add("checkDiffItems",checkDiffItems).add("checkDiff",checkDiff));
}
+
+ /**
+ * @author Ryan
+ * @date 2025/11/5
+ * @description: 甯屾棩鏃犲崟鎹复鏃剁洏鐐�
+ * @version 1.0
+ */
+ @Override
+ public R tempCheckItem(String barcode) {
+ if (Objects.isNull(barcode)) {
+ throw new CoolException("鎼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(Task::getBarcode, barcode);
+ Task task = taskService.getOne(lambdaQueryWrapper);
+ if (null == task) {
+ throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
+ }
+ if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
+ return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ if (Cools.isEmpty(taskItems)){
+ throw new CoolException("鏈壘鍒拌瀹瑰櫒鐮佸搴旂殑浠诲姟鏄庣粏");
+ }
+ 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
+ * @date 2025/11/5
+ * @description: 鐩樼偣娣诲姞鏂扮墿鏂�
+ * @version 1.0
+ */
+ @Override
+ public R confirmMatnr(Map<String, Object> map) {
+ if (Objects.isNull(map)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(map.get("barcode"))) {
+ throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(map.get("matnrs"))) {
+ throw new CoolException("鏂板鐗╂枡涓嶈兘涓虹┖锛侊紒");
+ }
+ String barcode = map.get("barcode").toString();
+ LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(Task::getBarcode, barcode);
+ Task task = taskService.getOne(lambdaQueryWrapper);
+ if (null == task) {
+ throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
+ }
+ if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
+ return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
+ }
+
+ List<Matnr> items = JSONArray.parseArray(JSONArray.toJSONString(map.get("matnrs")), Map<String, Object>.class);
+
+
+
+// if (Objects.isNull(map.get("taskId"))) {
+// throw new CoolException("浠诲姟ID涓嶈兘涓虹┖锛侊紒");
+// }
+// if (Objects.isNull(map.get("matnr"))) {
+// throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
+// }
+// if (Objects.isNull(map.get("batch"))) {
+// throw new CoolException("鎵规涓嶈兘涓虹┖锛侊紒");
+// }
+
+
+ return null;
+ }
+
}
--
Gitblit v1.9.1