checkncl

fqboss/app/base/service/impl/orderSve.js

@@ -1592,10 +1592,28 @@ class OrderService extends ServiceBase {
       if (checkRes.code != 1) {
       if (checkRes.code != 1) {
         return checkRes;
         return checkRes;
       }
       }
-      //判断尼斯小项的数量
+      //获取已提交的商标信息 用作校验重复提交
+      var oldtms = await this.trademarkDao.model.findAll({
+        where:{channelOrderNum:obj.channelOrderNum,applyName:apply.applyName},
+        raw:true
+      });
+      var oldNclOneCodes = [];//已提交商标尼斯集合
+      if(oldtms && oldtms.length>0){
+        for(var a=0;a<oldtms.length;a++){
+          var oldtm = oldtms[a];
+          oldNclOneCodes.push(oldtm.nclOneCodes);
+        }
+      }
+      //校验重复提交并判断尼斯小项的数量
       var selectNclThreeCount = 0;
       var selectNclThreeCount = 0;
       for (let index = 0; index < nclones.length; index++) {
       for (let index = 0; index < nclones.length; index++) {
         const element = nclones[index];
         const element = nclones[index];
+        if(element.code && oldNclOneCodes.length>0){
+          if(oldNclOneCodes.indexOf(element.code)>=0){
+            return { code: "-260", msg: "已存在第" + element.code + "类的商标，不能重复提交" };
+          }
+        }
+        
         var nclList = null;
         var nclList = null;
         if (typeof (element) == "string") {
         if (typeof (element) == "string") {
           nclList = JSON.parse(element);
           nclList = JSON.parse(element);