From 0b10eb6610b9d030ad351170124d3524e99d8b27 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 22 Oct 2024 17:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderBackupController.java           | 7 ++++---
 .../api/service/thrsys/SysWorkplacePutRelService.java     | 8 +++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
index f8f21cbe3..59cffeab6 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
@@ -41,8 +41,8 @@ public class IoCollectOrderBackupController extends BaseController {
     private BasicCollectUserService basicCollectUserService;
 
 
-    @GetMapping("/udiwms/basic/collect/orderFinish/filter")
-    public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) {
+    @PostMapping("/udiwms/basic/collect/orderFinish/filter")
+    public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
 
         List<Long> workPlaceCodes = null;
         List<UserWorkResponse> page;
@@ -97,7 +97,7 @@ public class IoCollectOrderBackupController extends BaseController {
     public BaseResponse orderUpload(@RequestBody CollectOrderRequest collectOrderRequest) {
         if (StrUtil.isEmpty(collectOrderRequest.getBillNo()))
             return ResultVOUtils.error(500, "单据号不能为空");
-        Boolean aBoolean = ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(),getUser());
+        Boolean aBoolean = ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(), getUser());
         if (!aBoolean) {
             return ResultVOUtils.error("上传失败");
         }
@@ -107,6 +107,7 @@ public class IoCollectOrderBackupController extends BaseController {
 
     /**
      * 通过业务外键获取码明细
+     *
      * @param collectOrderBizRequest
      * @return
      */
diff --git a/src/main/java/com/glxp/api/service/thrsys/SysWorkplacePutRelService.java b/src/main/java/com/glxp/api/service/thrsys/SysWorkplacePutRelService.java
index ebac573a4..686bd3f04 100644
--- a/src/main/java/com/glxp/api/service/thrsys/SysWorkplacePutRelService.java
+++ b/src/main/java/com/glxp/api/service/thrsys/SysWorkplacePutRelService.java
@@ -25,7 +25,13 @@ public class SysWorkplacePutRelService extends ServiceImpl<SysWorkplacePutRelMap
     @Resource
     private SysWorkplacePutRelMapper sysWorkplacePutRelMapper;
 
-
+    /**
+     * 通过采集工位获取上货工位
+     *
+     * @param workPlaceCode
+     * @param busType
+     * @return
+     */
     public SysWorkplacePutRel findPutWorkPlace(Long workPlaceCode, String busType) {
         List<SysWorkplacePutRel> sysWorkplacePutRelList = list(new LambdaQueryWrapper<SysWorkplacePutRel>().eq(SysWorkplacePutRel::getCollectWorkCode, workPlaceCode).eq(busType != null, SysWorkplacePutRel::getCollectBusType, busType));
         if (CollUtil.isNotEmpty(sysWorkplacePutRelList))