From 4c85017e06c3ffd79e9a3fab2d5b01419f8b743f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 09:39:04 +0800
Subject: [PATCH] #修改    1. 收货单历史档ID 更新    2. 收货单据字典类型转换    3. 收货单明细跟踪码修改

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

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 8fd8b82..385b535 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
@@ -9,9 +9,13 @@
 import com.vincent.rsf.server.common.domain.BaseParam;
 import com.vincent.rsf.server.common.domain.KeyValVo;
 import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
 import com.vincent.rsf.server.manager.entity.WaitPakin;
 import com.vincent.rsf.server.manager.service.WaitPakinService;
 import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -19,6 +23,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
+@Api(tags = "缁勬嫋閫氱煡妗�")
 @RestController
 public class WaitPakinController extends BaseController {
 
@@ -107,4 +112,38 @@
         ExcelUtil.build(ExcelUtil.create(waitPakinService.list(), WaitPakin.class), response);
     }
 
+
+    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
+    @ApiOperation("缁勬嫋")
+    @PostMapping("/waitPakin/merge")
+    public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
+        if (Objects.isNull(waitPakin)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        if (StringUtils.isBlank(waitPakin.getBarcode())) {
+            return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+        }
+        if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
+            return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
+        }
+        return R.ok(waitPakinService.mergeItems(waitPakin));
+    }
+
+    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
+    @ApiOperation("缁勬嫋瑙g粦")
+    @PostMapping("/waitPakin/unbind")
+    public R pakinUnBind(@RequestBody WaitPakinParam param) {
+        if (Objects.isNull(param)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        if (StringUtils.isBlank(param.getBarcode())) {
+            return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+        }
+        if (Objects.isNull(param.getItems()) || param.getItems().isEmpty()) {
+            return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
+        }
+        return R.ok(waitPakinService);
+
+    }
+
 }

--
Gitblit v1.9.1