From 82b6b1ddf9862bdde140fb9bfddd82ef099d67ef Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 28 Sep 2024 20:21:20 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/inout/IoCodeTempController.java | 6 +++---
 .../java/com/glxp/api/service/inout/IoSplitCodeService.java | 4 ++--
 .../mybatis/mapper/inout/IoSplitFifoCodeMapper.xml          | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 14ed604ac..5b6043811 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -159,8 +159,8 @@ public class IoCodeTempController extends BaseController {
         IoCollectOrderResponse collectOrder = collectOrderService.unionSearch(null, addEnterCodeRequest.getBusType(), code);
         if (collectOrder == null) {
             //查询原始单据查到为异常提示
-            IoCollectOrderOrigin ioCollectOrigin =  collectOriginService.getOrderByCode(code);
-            if (ioCollectOrigin != null){
+            IoCollectOrderOrigin ioCollectOrigin = collectOriginService.getOrderByCode(code);
+            if (ioCollectOrigin != null) {
                 BaseResponse response = ResultVOUtils.error(501, "单据已下载,转化异常");
                 response.setData(code);
                 return response;
@@ -580,7 +580,7 @@ public class IoCodeTempController extends BaseController {
             addOrderRequest.setBillNo(ioOrderEntity.getBillNo());
         }
         //TODO 退货校验是否有库存 提示产品不存在
-        if(StrUtil.equals("return",addOrderRequest.getSplitType())){
+        if (StrUtil.equals("return", addOrderRequest.getSplitType())) {
             //ioSplitFifoInvService.getOne(new LambdaQueryWrapper<IoSplitFifoInv>().eq(IoSplitFifoInv::getInvCode,"").last("limit 1"));
         }
         if (IntUtil.value(udiEntity.getProductType()) == 2) {
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
index 2475a641b..36c39ef94 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -355,8 +355,8 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
         Long putWorkPlaceCode = null;
         //获取上货工位
         SysWorkplacePutRel sysWorkplacePutRel = workplacePutRelService.findPutWorkPlace(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
-        if (sysWorkplacePutRel == null)
-            putWorkPlaceCode = sysWorkplacePutRel.getCollectWorkCode();
+        if (sysWorkplacePutRel != null)
+            putWorkPlaceCode = sysWorkplacePutRel.getWorkPlaceCode();
 
         List<IoCollectOrderBiz> collectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo());
         for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml
index 8d9b6757e..2be5487fc 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml
@@ -104,6 +104,7 @@
                 AND workPlaceCode = #{workPlaceCode}
             </if>
         </where>
+        group by io_split_fifo_code.id
     </select>