朱园亮 / xingyun-erp · Commits

Commit 5e7c3f61a9ce74c5f0518443c74a423fd8c2d3c9

Authored by 房远帅
1 parent 89c5b248

楚江ERP:草稿要车单-要车计划生成的数据不直接走审核

Inline Side-by-side
Showing 1 changed file with 8 additions and 4 deletions
@@ -155,7 +155,9 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq @@ -155,7 +155,9 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
155 if (!StringUtil.isBlank(vo.getStatus())) { 155 if (!StringUtil.isBlank(vo.getStatus())) {
156 data.setStatus(vo.getStatus()); 156 data.setStatus(vo.getStatus());
157 } else { 157 } else {
158 - data.setStatus("AUDIT"); 158 + if (!"SHIPMENTSPLAN".equals(vo.getSource())) {
  159 + data.setStatus("AUDIT");
  160 + }
159 } 161 }
160 if (!StringUtil.isBlank(vo.getSource())) { 162 if (!StringUtil.isBlank(vo.getSource())) {
161 data.setSource(vo.getSource()); 163 data.setSource(vo.getSource());
@@ -165,9 +167,11 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq @@ -165,9 +167,11 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
165 167
166 OpLogUtil.setVariable("id", data.getId()); 168 OpLogUtil.setVariable("id", data.getId());
167 OpLogUtil.setExtra(vo); 169 OpLogUtil.setExtra(vo);
168 - //开启审核  
169 - data.setUpdateById(SecurityUtil.getCurrentUser().getId());  
170 - flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data); 170 + if (!"SHIPMENTSPLAN".equals(vo.getSource())) {
  171 + //开启审核
  172 + data.setUpdateById(SecurityUtil.getCurrentUser().getId());
  173 + flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
  174 + }
171 175
172 return data.getId(); 176 return data.getId();
173 } 177 }