diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsController.java index ccb159a..e0b9d04 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsController.java @@ -99,7 +99,7 @@ public class ThrProductsController { filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode()); } List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); - if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 1) { return "该产品已与UDI码关联,无法删除!"; } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index 3f6b598..cdbe876 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -272,8 +272,8 @@ public class OrderServiceImpl implements OrderService { supplementOrder.setFromSubInvCode(order.getInvWarehouseCode()); //根据分库code查询总库coder InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseDao.filterGroupInvSubAndcode(order.getFromCorpId()); - supplementOrder.setLocStorageCode(invSubWarehouseEntity.getParentId()); - supplementOrder.setInvStorageCode(invSubWarehouseEntity.getParentId()); + supplementOrder.setLocStorageCode(invSubWarehouseEntity.getParentId()); + supplementOrder.setInvStorageCode(invSubWarehouseEntity.getParentId()); String name = invWarehouseDao.getNameByCode(order.getInvStorageCode()); if (StrUtil.isNotEmpty(order.getFromSubInvCode())) { diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 09f857b..131a653 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -50,7 +50,7 @@ AND nameCode LIKE concat(#{nameCode},'%') - AND thirdId LIKE concat(#{thirdId},'%') + AND thirdId LIKE #{thirdId} AND basic_udirel.uuid = #{uuid}