diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index 98427c13..33e51b16 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -219,8 +219,7 @@ public class ThrProductsAddDiController { udiProductEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6()); udiProductEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7()); udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8()); - udiProductService.updateUdiInfo(udiProductEntity); - + udiProductService.updateUdiInfoByUuid(udiProductEntity); UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceEntity1); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity1); @@ -250,12 +249,11 @@ public class ThrProductsAddDiController { } } } - } } - return ResultVOUtils.success(); + return ResultVOUtils.success("更新成功"); } /** diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index e1dcaa9a..7d4ad53f 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -222,11 +222,11 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService if (StrUtil.isNotEmpty(deliveryInstock) && deliveryInstock.equals("1")) { bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT) - .gt("spUse", 0).eq("enable", true)); + .gt("spUse", 1).eq("enable", true)); } else { bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT) - .gt("spUse", 0).eq("inStock", false).eq("enable", true)); + .gt("spUse", 1).eq("inStock", false).eq("enable", true)); } break;