Merge branch 'ww' into orderChange

api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java

@@ -90,9 +90,9 @@ public class ThrProductsAddController {
         }
 
         ThrProductsAddEntity tempEntity = thrProductsAddService.selectById(thrProductsAddEntity.getId() + "");
-        if (!thrProductsService.isExit(tempEntity.getCode(), tempEntity.getThirdSysFk())) {
-            return ResultVOUtils.error(500, "已存在相同产品编码，无法添加！");
-        }
+//        if (thrProductsService.isExit(tempEntity.getCode(), tempEntity.getThirdSysFk())) {
+//            return ResultVOUtils.error(500, "已存在相同产品编码，无法添加！");
+//        }
         thrProductsAddService.updateThrProducts(thrProductsAddEntity);
         if (thrProductsAddEntity.getCheckStatus() == 2) {
             ThrProductsEntity thrProductsEntity = new ThrProductsEntity();