laolan

center-order/app/base/service/impl/qcutils/aliyunqcSve.js

@@ -1049,13 +1049,8 @@ class AliyunQcService {
     if (!user || !user.id) {
       return system.getResultFail(-100, "未知用户");
     }
-<<<<<<< HEAD
     if (!ab.orderNo) {
       return system.getResultFail(-101, "订单号不能为空");
-=======
-    if (!ab.solutionNo) {
-      return system.getResultFail(-101, "方案编号不能为空");
->>>>>>> 13f457d854f6497e537354a63c2833a868ecf001
     }
     if (!ab.ApplicationStatus) {
       return system.getResultFail(-102, "交付状态不能为空");
@@ -1065,12 +1060,7 @@ class AliyunQcService {
     }
     //获取方案信息
     var needsolutioninfo = await this.needsolutionDao.model.findOne({
-<<<<<<< HEAD
       where: { orderNo: ab.orderNo }, raw: true
-=======
-      attributes: ["id", "status", "solutionContent", "needNo"],
-      where: { solutionNo: ab.solutionNo }, raw: true
->>>>>>> 13f457d854f6497e537354a63c2833a868ecf001
     });
     if (!needsolutioninfo || !needsolutioninfo.id) {
       return system.getResultFail(-400, "未知方案");