Merge branch 'test' into dev

This commit is contained in:
joylink_zhangsai 2021-12-08 17:06:34 +08:00
commit edd6279e63

View File

@ -796,13 +796,12 @@ public class RunPlanDraftService implements IRunPlanDraftService {
// tripVO.setIsInbound(true); // tripVO.setIsInbound(true);
tripVO.setIsReentry(false); tripVO.setIsReentry(false);
// tripVO.setIsOutbound(false); // tripVO.setIsOutbound(false);
} else if (i == 0) {
tripVO.setIsReentry(true);
// tripVO.setIsInbound(false);
} else { } else {
// tripVO.setIsInbound(false); if (tripVO.getIsInbound() != null && tripVO.getIsInbound()) { //入库计划
tripVO.setIsReentry(true); tripVO.setIsReentry(false);
// tripVO.setIsOutbound(false); } else { //非入库计划
tripVO.setIsReentry(true);
}
} }
} }
//是否为备用车 //是否为备用车