From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 06 六月 2025 19:19:34 +0800 Subject: [PATCH] 开发更新 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwOutinboundRecordServiceImpl.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwOutinboundRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwOutinboundRecordServiceImpl.java index b839bc7..7aa22d3 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwOutinboundRecordServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwOutinboundRecordServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -97,13 +98,15 @@ MPJLambdaWrapper<YwOutinboundRecord> queryWrapper = new MPJLambdaWrapper<YwOutinboundRecord>(); Utils.MP.blankToNull(pageWrap.getModel()); YwOutinboundRecord model = pageWrap.getModel(); - if(Objects.isNull(model)||Objects.isNull(model.getInOut())){ - throw new BusinessException(ResponseStatus.BAD_REQUEST); + List<Integer> typeList = new ArrayList<>(); + if(!(Objects.isNull(model)||Objects.isNull(model.getInOut()))){ + typeList = Constants.ywOutInType.getAllTypeKey(model.getInOut()); } - List<Integer> typeList = Constants.ywOutInType.getAllTypeKey(model.getInOut()); queryWrapper.selectAll(YwOutinboundRecord.class) .selectAs(SystemUser::getRealname,YwOutinboundRecord::getCreateUserName) .selectAs(YwOutinbound::getCode,YwOutinboundRecord::getCode) + .selectAs(YwOutinbound::getType,YwOutinboundRecord::getType) + .selectAs(YwOutinbound::getDoneDate,YwOutinboundRecord::getDoneDate) .selectAs(YwWarehouse::getName,YwOutinboundRecord::getWarehouseName) .selectAs(YwMaterial::getCode,YwOutinboundRecord::getMaterialCode) .selectAs(YwMaterial::getName,YwOutinboundRecord::getMaterialName) -- Gitblit v1.9.3