问题修改

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

@@ -64,7 +64,7 @@ public class ScmApplyInboundRest implements ScmApplyInboundFeign {
 
 	@Override
 	public ResultBean submitRecordApplication(SubmitScmApplyInboundDto dto) {
-		return new ResultBean().success().setData(scmApplyInboundService.submitRecordApplication(dto));
+		return  scmApplyInboundService.submitRecordApplication(dto);
 	}
 
 	@Override

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

@@ -382,7 +382,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
         if (StringUtils.isBlank(busSid)) {
             Map<String, Object> variables = BeanUtil.beanToMap(dto);
-            ResultBean resultBean = saveOrUpdateApplyInBound(dto);//insert
+            ResultBean<String> resultBean = saveOrUpdateApplyInBound(dto);
+            if (!resultBean.getSuccess()){
+                return ResultBean.fireFail().setMsg(resultBean.getMsg());
+            }
             String businessSid = resultBean.getData().toString();
             ScmApplyInbound scmApplyInbound = fetchBySid(businessSid);
             List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos1 = new ArrayList<>();
@@ -459,7 +462,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             dto.setNum(String.valueOf(scmApplyInboundVehicleDtos2.size()));
             ResultBean<String> stringResultBean = saveOrUpdateApplyInBound(dto);
             if (!stringResultBean.getSuccess()){
-                return new ResultBean().setMsg(stringResultBean.getMsg());
+                return ResultBean.fireFail().setMsg(stringResultBean.getMsg());
             }
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo uff = resultBean1.getData();
@@ -468,7 +471,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         } else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
             dto.setVehicleList(scmApplyInboundVehicleDtos2);
             dto.setNum(String.valueOf(scmApplyInboundVehicleDtos2.size()));
-            saveOrUpdateApplyInBound(dto);
+            ResultBean<String> stringResultBean = saveOrUpdateApplyInBound(dto);
+            if (!stringResultBean.getSuccess()){
+                return ResultBean.fireFail().setMsg(stringResultBean.getMsg());
+            }
             bv.setTaskDefKey(entity.getTaskDefKey());
             bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
             bv.setInstanceId(entity.getProcInsId());