From 9e318b8f8e9fd2d1995e79dcef7ddc73484f0346 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 22 Oct 2024 17:51:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=8D?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoSplitFifoInvController.java       | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java
index 41ca7f480..5993c3641 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java
@@ -1,15 +1,23 @@
 package com.glxp.api.controller.inout;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.dao.basic.SysWorkplaceDocumentDao;
+import com.glxp.api.entity.auth.SysWorkplace;
+import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
+import com.glxp.api.entity.basic.SysWorkplacePutRel;
 import com.glxp.api.req.inout.IoSplitFifoInvRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.inout.IoSplitInvResponse;
+import com.glxp.api.service.auth.SysWorkplaceService;
+import com.glxp.api.service.basic.SysWorkplaceDocumentService;
 import com.glxp.api.service.inout.IoSplitFifoInvService;
+import com.glxp.api.service.thrsys.SysWorkplacePutRelService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,9 +32,12 @@ import java.util.List;
 @RestController
 public class IoSplitFifoInvController extends BaseController {
 
-
+    @Resource
+    SysWorkplaceService sysWorkplaceService;
     @Resource
     IoSplitFifoInvService splitFifoInvService;
+    @Resource
+    SysWorkplacePutRelService sysWorkplacePutRelService;
 
     /**
      * 库存查询
@@ -39,6 +50,16 @@ public class IoSplitFifoInvController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+
+        //判断是否为采集工位
+        Long workPlaceCode = ioSplitFifoInvRequest.getWorkPlaceCode();
+        SysWorkplace workplace = sysWorkplaceService.getWorkplace(workPlaceCode);
+        Integer workPlaceClass = workplace.getWorkPlaceClass();
+        if (workPlaceClass == 1){
+            SysWorkplacePutRel putWorkPlace = sysWorkplacePutRelService.findPutWorkPlace(workPlaceCode, null);
+            ioSplitFifoInvRequest.setWorkPlaceCode(putWorkPlace.getWorkPlaceCode());
+        }
+
         List<IoSplitInvResponse> splitCodeEntities = splitFifoInvService.filterList(ioSplitFifoInvRequest);
         for (IoSplitInvResponse ioSplitCodeResponse : splitCodeEntities) {
             if (StrUtil.isEmpty(ioSplitCodeResponse.getGgxh())) {