修改bug

zhairh
wangwei 3 years ago
parent 23091d21fb
commit 6cfd683086

@ -99,7 +99,7 @@ public class ThrProductsController {
filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode()); filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
} }
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 1) {
return "该产品已与UDI码关联无法删除"; return "该产品已与UDI码关联无法删除";
} }
} }

@ -272,8 +272,8 @@ public class OrderServiceImpl implements OrderService {
supplementOrder.setFromSubInvCode(order.getInvWarehouseCode()); supplementOrder.setFromSubInvCode(order.getInvWarehouseCode());
//根据分库code查询总库coder //根据分库code查询总库coder
InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseDao.filterGroupInvSubAndcode(order.getFromCorpId()); InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseDao.filterGroupInvSubAndcode(order.getFromCorpId());
supplementOrder.setLocStorageCode(invSubWarehouseEntity.getParentId()); supplementOrder.setLocStorageCode(invSubWarehouseEntity.getParentId());
supplementOrder.setInvStorageCode(invSubWarehouseEntity.getParentId()); supplementOrder.setInvStorageCode(invSubWarehouseEntity.getParentId());
String name = invWarehouseDao.getNameByCode(order.getInvStorageCode()); String name = invWarehouseDao.getNameByCode(order.getInvStorageCode());
if (StrUtil.isNotEmpty(order.getFromSubInvCode())) { if (StrUtil.isNotEmpty(order.getFromSubInvCode())) {

@ -50,7 +50,7 @@
AND nameCode LIKE concat(#{nameCode},'%') AND nameCode LIKE concat(#{nameCode},'%')
</if> </if>
<if test="thirdId != '' and thirdId != null"> <if test="thirdId != '' and thirdId != null">
AND thirdId LIKE concat(#{thirdId},'%') AND thirdId LIKE #{thirdId}
</if> </if>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid} AND basic_udirel.uuid = #{uuid}

Loading…
Cancel
Save