Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.java

@@ -53,4 +53,7 @@ public interface ScmApplyInboundMapper extends BaseMapper<ScmApplyInbound> {
 
     @Update("update scm_apply_inbound set num = #{num},nodeState = '已办结' where sid = #{busSid}")
     void updateNumAndNodeStateBySid(@Param("num") String num, @Param("busSid") String busSid);
+
+    @Update("update scm_apply_inbound set nodeState = '待提交' where sid = #{sid}")
+    void updateNodeStatedtj(String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -278,10 +278,12 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 int count = scmApplyInboundVehicleService.checkVinNo(vinNoList.get(i), dto.getUseOrgSid(), dto.getSid());
                 BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(vinNoList.get(i), dto.getUseOrgSid()).getData();
                 if (count > 0) {
+                    baseMapper.updateNodeStatedtj(dto.getSid());
                     return new ResultBean().setMsg("入库车辆信息中" + vinNoList.get(i) + "车架号已经存在");
                 }
                 if (data != null) {
                     if (StringUtils.isNotBlank(data.getVinNo())) {
+                        baseMapper.updateNodeStatedtj(dto.getSid());
                         return new ResultBean().setMsg("车辆台账信息中" + vinNoList.get(i) + "车架号已经存在");
                     }
                 }