diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index 2cc5d40f..e98dd4cf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -247,7 +247,7 @@ public class UdiRelevanceController { for (int i = 0; i < udiInfoEntities.size(); i++) { List warehouseEntityList = warehouseService.searchCode(udiInfoEntities.get(i).getNameCode()); if (warehouseEntityList != null && warehouseEntityList.size() > 0) { - return ResultVOUtils.error(500, "改产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除"); + return ResultVOUtils.error(500, "该产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除"); } } } @@ -257,7 +257,7 @@ public class UdiRelevanceController { if (StrUtil.isNotEmpty(ids)) { List warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest); if (CollUtil.isNotEmpty(warehouseEntityList)) { - return ResultVOUtils.error(500, "改产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除"); + return ResultVOUtils.error(500, "该产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除"); } } } @@ -265,7 +265,7 @@ public class UdiRelevanceController { CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(ids, null); if (companyProductRelevanceEntity != null) { - return ResultVOUtils.error(500, "改产品已被供应商选入" + "不能删除!"); + return ResultVOUtils.error(500, "该产品已被已被供应商选入" + "不能删除!"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java index b3224456..515233a9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java @@ -36,8 +36,8 @@ public class BasicUnitMaintainEntity { private String thirdName4; private Date updateTime; - private int corpType; + private Integer corpType; - private int outType; + private Integer outType; }