Pārlūkot izejas kodu

2024年4月24日09:14:50

纪新园 1 gadu atpakaļ
vecāks
revīzija
6fb901484f

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TGoodsController.java

@@ -75,9 +75,9 @@ public class TGoodsController extends BaseController {
         // 检验编号、名称、地址 唯一
         if (UserConstants.NOT_UNIQUE.equals(tGoodsService.checkUFNoUnique(tGoods))) {
             return AjaxResult.error("新增商品'" + tGoods.getfNo() + "'失败,编号已存在");
-        } else if (UserConstants.NOT_UNIQUE.equals(tGoodsService.checkUFNnameUnique(tGoods))) {
+        } /*else if (UserConstants.NOT_UNIQUE.equals(tGoodsService.checkUFNnameUnique(tGoods))) {
             return AjaxResult.error("新增商品'" + tGoods.getfName() + "'失败,名称已存在");
-        }
+        }*/
         return toAjax(tGoodsService.insertTGoods(tGoods));
     }
 
@@ -91,9 +91,9 @@ public class TGoodsController extends BaseController {
         // 检验编号、名称、地址 唯一
         if (UserConstants.NOT_UNIQUE.equals(tGoodsService.checkUFNoUnique(tGoods))) {
             return AjaxResult.error("新增商品'" + tGoods.getfNo() + "'失败,编号已存在");
-        } else if (UserConstants.NOT_UNIQUE.equals(tGoodsService.checkUFNnameUnique(tGoods))) {
+        } /*else if (UserConstants.NOT_UNIQUE.equals(tGoodsService.checkUFNnameUnique(tGoods))) {
             return AjaxResult.error("新增商品'" + tGoods.getfName() + "'失败,名称已存在");
-        }
+        }*/
         return tGoodsService.updateTGoods(tGoods);
     }
 

+ 2 - 2
ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TGoodsServiceImpl.java

@@ -100,14 +100,14 @@ public class TGoodsServiceImpl implements ITGoodsService {
                 return AjaxResult.error("商品在库存总账有记录不可变更状态");
             }
         }
-        TWhgenleg tWhgenleg = new TWhgenleg();
+       /* TWhgenleg tWhgenleg = new TWhgenleg();
         tWhgenleg.setfGoodsid(tGoods.getfId());
         List<TWhgenleg> selectTWhgenlegList = tWhgenlegMapper.selectTWhgenlegV2(tWhgenleg);
         for (TWhgenleg selectTWhgenleg : selectTWhgenlegList) {
             if (ObjectUtils.isNotNull(selectTWhgenleg) && selectTWhgenleg.getfQtyblc().compareTo(new BigDecimal("0")) != 0) {
                 return AjaxResult.error("该商品存在未出库库存,禁止修改");
             }
-        }
+        }*/
         if (ObjectUtils.isNull(tGoods.getStockWarning())) {
             tGoods.setStockWarning(new BigDecimal(0));
         }

+ 1 - 1
ruoyi-warehouse/src/main/resources/mapper/basicData/TGoodsMapper.xml

@@ -206,4 +206,4 @@
         where f_id = #{id}
     </select>
 
-</mapper>
+</mapper>