耗材字典多个DI信息问题

orderChange
anthonywj 3 years ago
parent e3de0a7ac3
commit f714a84bc4

@ -320,6 +320,7 @@ public class UdiInfoController {
public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) { public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(productInfoFilterRequest.getRelId()); UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(productInfoFilterRequest.getRelId());
productInfoFilterRequest.setRelId(productInfoFilterRequest.getRelId());
List<UdiInfoEntity> udiInfoEntities = udiInfoService.filterAllUdiInfo(productInfoFilterRequest); List<UdiInfoEntity> udiInfoEntities = udiInfoService.filterAllUdiInfo(productInfoFilterRequest);
if (CollUtil.isNotEmpty(udiInfoEntities)) { if (CollUtil.isNotEmpty(udiInfoEntities)) {
for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
@ -330,8 +331,6 @@ public class UdiInfoController {
} }
} }
} }
return ResultVOUtils.success(udiInfoEntities); return ResultVOUtils.success(udiInfoEntities);
} }

@ -1,9 +1,9 @@
# \u751F\u4EA7\u73AF\u5883 # \u751F\u4EA7\u73AF\u5883
server.port=9906 server.port=9906
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.jdbc-url=jdbc:mysql://192.168.0.62:3306/spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=123456 spring.datasource.password=Glxp@6066
spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.connection-timeout=60000
spring.datasource.hikari.maximum-pool-size=60 spring.datasource.hikari.maximum-pool-size=60
spring.datasource.hikari.minimum-idle=10 spring.datasource.hikari.minimum-idle=10

@ -101,6 +101,10 @@
<if test="sptm != '' and sptm != null"> <if test="sptm != '' and sptm != null">
AND basic_products.sptm = #{sptm} AND basic_products.sptm = #{sptm}
</if> </if>
<if test="relId != '' and relId != null">
AND basic_udirel.id = #{relId}
</if>
</where> </where>
</select> </select>

Loading…
Cancel
Save