From 5f2239d494416000c1b4bd3aae137563955030d9 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 30 Mar 2023 13:41:14 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=AD=98=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E8=AE=BE=E7=BD=AE=E7=9B=B8=E5=85=B3=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inv/InvRemindSetController.java | 4 ++++ .../service/inv/impl/InvRemindSetServiceImpl.java | 8 ++++++-- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 2 +- .../mybatis/mapper/inv/invProductDao.xml | 15 ++++++++++----- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java b/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java index 8097bd7d..f7d7fde3 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.inv; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; @@ -59,6 +60,9 @@ public class InvRemindSetController { */ @PostMapping("/udiwms/inv/remind/set/batchAddInvRemindSet") public BaseResponse batchAddInvRemindSet(@RequestBody AddInvRemindSetRequest addInvRemindSetRequest) { + if (null == addInvRemindSetRequest || CollUtil.isEmpty(addInvRemindSetRequest.getRelIdList())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } return invRemindSetService.batchAddInvRemindSet(addInvRemindSetRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java index a520c462..e2cf2965 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java @@ -161,12 +161,13 @@ public class InvRemindSetServiceImpl implements InvRemindSetService { InvRemindSetEntity invRemindSetEntity = invRemindSetDao.selectOne(new QueryWrapper() .eq("invCode", addInvRemindSetRequest.getInvCode()) .eq(StrUtil.isNotBlank(addInvRemindSetRequest.getInvSpaceCode()), "invSpaceCode", addInvRemindSetRequest.getInvSpaceCode()) - .eq(StrUtil.isNotBlank(addInvRemindSetRequest.getRelId()), "relId", addInvRemindSetRequest.getRelId()) + .eq("relId", relId) .eq(StrUtil.isNotBlank(addInvRemindSetRequest.getGgxh()), "ggxh", addInvRemindSetRequest.getGgxh()) ); if (null == invRemindSetEntity) { invRemindSetEntity = new InvRemindSetEntity(); BeanUtil.copyProperties(addInvRemindSetRequest, invRemindSetEntity); + invRemindSetEntity.setRelId(relId); verifySetParams(invRemindSetEntity); setUpdateInfo(invRemindSetEntity); invRemindSetDao.insert(invRemindSetEntity); @@ -184,10 +185,13 @@ public class InvRemindSetServiceImpl implements InvRemindSetService { //查询有无相同设置，有则更新时间 InvRemindSetEntity invRemindSetEntity = invRemindSetDao.selectOne(new QueryWrapper() .eq("invCode", addInvRemindSetRequest.getInvCode()) - .eq(StrUtil.isNotBlank(addInvRemindSetRequest.getInvSpaceCode()), "invSpaceCode", addInvRemindSetRequest.getInvSpaceCode())); + .eq(StrUtil.isNotBlank(addInvRemindSetRequest.getInvSpaceCode()), "invSpaceCode", addInvRemindSetRequest.getInvSpaceCode()) + .isNull("relId") + ); if (null == invRemindSetEntity) { invRemindSetEntity = new InvRemindSetEntity(); BeanUtil.copyProperties(addInvRemindSetRequest, invRemindSetEntity); + invRemindSetEntity.setStatus(1); setUpdateInfo(invRemindSetEntity); invRemindSetDao.insert(invRemindSetEntity); } else { diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index feea458e..5c544687 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1090,7 +1090,7 @@ diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml index 0b2e3bf1..7243cfaa 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml @@ -316,11 +316,13 @@ ip.deptCode, ip.invCode from inv_product ip - inner join basic_udirel on ip.relIdFk = basic_udirel.id - inner join basic_products bp on basic_udirel.uuid = bp.uuid - left join basic_corp on ip.supId = basic_corp.erpId - left join auth_dept on auth_dept.code = ip.deptCode - left join auth_warehouse on auth_warehouse.code = ip.invCode + inner join basic_udirel on ip.relIdFk = basic_udirel.id + inner join basic_products bp on basic_udirel.uuid = bp.uuid + left join basic_corp on ip.supId = basic_corp.erpId + left join auth_dept on auth_dept.code = ip.deptCode + left join auth_warehouse on auth_warehouse.code = ip.invCode + left join inv_product_detail ipd on ip.invCode = ipd.invCode and ip.relIdFk = ipd.relId and + ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty') bp.diType = 1 @@ -371,6 +373,9 @@ AND basic_corp.name like concat('%', #{supName}, '%') + + AND ipd.invSpaceCode = #{invSpaceCode} + group by ip.relIdFk order by ip.updateTime desc