外部报验功能-构件跟踪

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxOutsideInspectionComponentTrackServiceImpl.java

@@ -114,8 +114,9 @@ public class ZhcxOutsideInspectionComponentTrackServiceImpl extends ServiceImpl<
         //已保存的构件和报验点，不再重新保存
         LambdaQueryWrapper<ZhcxOutsideInspectionComponentTrackDo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(ZhcxOutsideInspectionComponentTrackDo::getStructurename, itpDo.getStructurename())
-                .eq(ZhcxOutsideInspectionComponentTrackDo::getMachineno, itpDo.getMachineno())
-                .eq(ZhcxOutsideInspectionComponentTrackDo::getStructuremachineno, itpDo.getStructuremachineno())
+//                .eq(ZhcxOutsideInspectionComponentTrackDo::getMachineno, itpDo.getMachineno())
+//                .eq(ZhcxOutsideInspectionComponentTrackDo::getStructuremachineno, itpDo.getStructuremachineno())
+                .eq(ZhcxOutsideInspectionComponentTrackDo::getDeleted, "0")
                 .eq(ZhcxOutsideInspectionComponentTrackDo::getProjectid, itpDo.getProjectid());
         int count = count(queryWrapper);
         if(count > 0) {