试车

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

@@ -29,7 +29,11 @@ public interface ZhcxCommissionCheckService extends IService<ZhcxCommissionCheck
      */
     R commissionCheckAdd(CommissionCheckDTO checkDTO);
 
-
+    /**
+     * 试车报告子表同步更新其他机台
+     * @param detailDTO 参数
+     * @return 响应状态
+     */
     R updateSynchronizationDetail(CheckDetailDTO detailDTO);
 
     /**

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

@@ -287,8 +287,8 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
             return R.error("主表id为空");
         }
         // 判断该机台是否已发运 如果已发运 就直接返回
-        if(baseMapper.checkedShippedByMasterId2(masterId) == 0){
-            return R.ok("该机台已发运,无需同步");
+        if(baseMapper.checkedShippedByMasterId2(masterId) > 0){
+            return R.ok("该机台已发运或已交机,无需同步");
         }
         // 找到该项目下面其他 还没有发运的 机台主表数据
         List<ZhcxCommissionCheckDo> list = baseMapper.getOtherShippeCheckList2(masterId);

business-common/src/main/resources/mybatis/business/ZhcxCommissionCheckDao.xml

@@ -35,7 +35,7 @@
             FROM
             INCONTROL.ZHCX_COMMISSION_CHECK t2
             WHERE
-            t2.ID = #{masterId} AND DELETED ='0' ) AND (STATUS !='发运' OR  STATUS IS NULL)
+            t2.ID = #{masterId} AND DELETED ='0' ) AND (STATUS ='发运' OR  STATUS = '已交机')
     </select>
 
     <select id="getOtherShippeCheckList" resultType="com.rongwei.bsentity.domain.ZhcxCommissionCheckDo">
@@ -73,8 +73,7 @@
                 JOIN INCONTROL.ZHCX_PROJECT_DEVICE_NUMBER nu ON
                 c.MACHINEID = nu.ID
                     AND nu.DELETED = '0'
-                    AND (nu.STATUS != '发运'
-		OR nu.STATUS IS NULL)
+                    AND (nu.STATUS != '发运' OR nu.STATUS IS NULL OR nu.STATUS != '已交机')
         WHERE
             c.PROJECTCODE = (
                 SELECT