From f98133e1007e24e10078fce46377d8a7357c7bb8 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 18 Jul 2023 15:58:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=94=A8=E5=86=85?= =?UTF-8?q?=E9=83=A8=E7=A0=81=E8=BF=9B=E8=A1=8C=E8=B0=83=E6=8B=A8=E5=87=BA?= =?UTF-8?q?=E5=BA=93=20=E6=8F=90=E7=A4=BA=E5=BA=93=E5=AD=98=E4=B8=8D?= =?UTF-8?q?=E8=B6=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoCodeTempController.java | 2 +- .../api/service/inv/impl/InvProductDetailServiceImpl.java | 2 +- src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 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 b8a118b18..b3d011972 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -630,7 +630,7 @@ public class IoCodeTempController extends BaseController { } else if (StrUtil.isNotEmpty(addOrderRequest.getSelectSupId())) { unitFk = addOrderRequest.getSelectSupId(); } - //产品是否可以以使用单元入库 + //产品是否禁用 udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(codeEnttity.getNameCode(), false); if (udiRelevanceResponses.size() >= 1) { if (udiRelevanceResponse == null) { diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java index fe43bd0ad..154224408 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java @@ -182,7 +182,7 @@ public class InvProductDetailServiceImpl implements InvProductDetailService { } List datas = invProductDetailDao.selectList(new QueryWrapper().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) - .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode) + .and(i-> i.isNull(StrUtil.isEmpty(batchNo), "batchNo").or().eq("batchNo","")).eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode) .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) ); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 4569d2fce..912ed505d 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1282,7 +1282,7 @@ isLock, lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, - remark, useExpireTime, dispatch, groupBuy，needCert) + remark, useExpireTime, dispatch, groupBuy,needCert) values @@ -1308,7 +1308,7 @@ #{item.modifyTime}, #{item.createUser}, #{item.updateUser}, - #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}，#{item.needCert}) + #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy},#{item.needCert})