朱园亮 / xingyun-erp · Commits

Commit 1cd1468f10718b2803e1589b11b9e43bb838a5e8

Authored by yeqianyong
2 parents 9d060ac2 6c5ac253

Merge remote-tracking branch 'origin/master_0929' into master_0929

Inline Side-by-side
Showing 1 changed file with 16 additions and 1 deletions
@@ -21,9 +21,10 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog; @@ -21,9 +21,10 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
21 import com.lframework.starter.web.core.utils.PageHelperUtil; 21 import com.lframework.starter.web.core.utils.PageHelperUtil;
22 import com.lframework.starter.common.utils.Assert; 22 import com.lframework.starter.common.utils.Assert;
23 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType; 23 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
  24 +import com.lframework.xingyun.basedata.entity.Workshop;
  25 +import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
24 import com.lframework.xingyun.sc.entity.CustomerCredit; 26 import com.lframework.xingyun.sc.entity.CustomerCredit;
25 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo; 27 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
26 -import com.lframework.xingyun.sc.entity.PurchaseOrderLine;  
27 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus; 28 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
28 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper; 29 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
29 import com.lframework.xingyun.sc.service.customer.CustomerCreditService; 30 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
@@ -53,6 +54,8 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde @@ -53,6 +54,8 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
53 private FlowInstanceWrapperService flowInstanceWrapperService; 54 private FlowInstanceWrapperService flowInstanceWrapperService;
54 @Resource 55 @Resource
55 private FlowTaskWrapperMapper flowTaskWrapperMapper; 56 private FlowTaskWrapperMapper flowTaskWrapperMapper;
  57 + @Resource
  58 + private WorkshopService workshopService;
56 59
57 @Override 60 @Override
58 public PageResult<PurchaseOrderInfo> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) { 61 public PageResult<PurchaseOrderInfo> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
@@ -235,6 +238,12 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde @@ -235,6 +238,12 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
235 } 238 }
236 //开启审核 239 //开启审核
237 data.setUserId(SecurityUtil.getCurrentUser().getId()); 240 data.setUserId(SecurityUtil.getCurrentUser().getId());
  241 + if (StringUtils.isNotEmpty(data.getWorkshopId())) {
  242 + Workshop workshop = workshopService.findById(data.getWorkshopId());
  243 + if (workshop != null) {
  244 + data.setWorkshopName(workshop.getName());
  245 + }
  246 + }
238 flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data); 247 flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
239 248
240 return data.getId(); 249 return data.getId();
@@ -293,6 +302,12 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde @@ -293,6 +302,12 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
293 OpLogUtil.setExtra(vo); 302 OpLogUtil.setExtra(vo);
294 //开启审核 303 //开启审核
295 data.setUserId(SecurityUtil.getCurrentUser().getId()); 304 data.setUserId(SecurityUtil.getCurrentUser().getId());
  305 + if (StringUtils.isNotEmpty(data.getWorkshopId())) {
  306 + Workshop workshop = workshopService.findById(data.getWorkshopId());
  307 + if (workshop != null) {
  308 + data.setWorkshopName(workshop.getName());
  309 + }
  310 + }
296 flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data); 311 flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
297 } 312 }
298 313