朱园亮 / xingyun-erp · Commits

Commit e3692f784299f0fcc67c3e97493fd00f5b3da385

Authored by 房远帅
1 parent fd6064ed

楚江ERP:未锁规格申请单审批添加生产分厂

Inline Side-by-side
Showing 2 changed files with 22 additions and 1 deletions
@@ -65,6 +65,12 @@ public class SpecLockDelayApplication extends BaseEntity implements BaseDto { @@ -65,6 +65,12 @@ public class SpecLockDelayApplication extends BaseEntity implements BaseDto {
65 private LocalDateTime approvedAt; 65 private LocalDateTime approvedAt;
66 66
67 /** 67 /**
  68 + * 生产厂编码(非持久化字段)
  69 + */
  70 + @TableField(exist = false)
  71 + private String workshopCode;
  72 +
  73 + /**
68 * 创建人ID 74 * 创建人ID
69 */ 75 */
70 @TableField(fill = FieldFill.INSERT) 76 @TableField(fill = FieldFill.INSERT)
@@ -23,6 +23,8 @@ import com.lframework.starter.web.core.utils.PageResultUtil; @@ -23,6 +23,8 @@ import com.lframework.starter.web.core.utils.PageResultUtil;
23 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType; 23 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
24 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto; 24 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
25 import com.lframework.starter.web.inner.service.system.SysUserRoleService; 25 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
  26 +import com.lframework.xingyun.basedata.entity.Workshop;
  27 +import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
26 import com.lframework.xingyun.sc.entity.ContractDistributorStandard; 28 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
27 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication; 29 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
28 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus; 30 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
@@ -58,7 +60,7 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL @@ -58,7 +60,7 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
58 60
59 @Autowired 61 @Autowired
60 private FlowInstanceWrapperService flowInstanceWrapperService; 62 private FlowInstanceWrapperService flowInstanceWrapperService;
61 - @Autowired 63 + @Resource
62 private FlowTaskWrapperMapper flowTaskWrapperMapper; 64 private FlowTaskWrapperMapper flowTaskWrapperMapper;
63 @Autowired 65 @Autowired
64 private ContractDistributorStandardService contractDistributorStandardService; 66 private ContractDistributorStandardService contractDistributorStandardService;
@@ -68,6 +70,8 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL @@ -68,6 +70,8 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
68 private MqProducerService mqProducerService; 70 private MqProducerService mqProducerService;
69 @Resource 71 @Resource
70 private SysUserRoleService sysUserRoleService; 72 private SysUserRoleService sysUserRoleService;
  73 + @Resource
  74 + private WorkshopService workshopService;
71 75
72 @Override 76 @Override
73 public PageResult<SpecLockDelayApplication> query(Integer pageIndex, Integer pageSize, QuerySpecLockDelayApplicationVo vo) { 77 public PageResult<SpecLockDelayApplication> query(Integer pageIndex, Integer pageSize, QuerySpecLockDelayApplicationVo vo) {
@@ -127,6 +131,12 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL @@ -127,6 +131,12 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
127 OpLogUtil.setExtra(vo); 131 OpLogUtil.setExtra(vo);
128 132
129 // 开启审核 133 // 开启审核
  134 + data.setCreateById(SecurityUtil.getCurrentUser().getId());
  135 + ContractDistributorStandard standard = contractDistributorStandardService.findById(vo.getContractId());
  136 + if (standard != null) {
  137 + Workshop workshop = workshopService.findById(standard.getWorkshopId());
  138 + data.setWorkshopCode(workshop == null ? "" : workshop.getCode());
  139 + }
130 flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data); 140 flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data);
131 return data.getId(); 141 return data.getId();
132 } 142 }
@@ -176,6 +186,11 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL @@ -176,6 +186,11 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
176 OpLogUtil.setExtra(vo); 186 OpLogUtil.setExtra(vo);
177 187
178 // 编辑完成再次开启审核 188 // 编辑完成再次开启审核
  189 + ContractDistributorStandard standard = contractDistributorStandardService.findById(data.getContractId());
  190 + if (standard != null) {
  191 + Workshop workshop = workshopService.findById(standard.getWorkshopId());
  192 + data.setWorkshopCode(workshop == null ? "" : workshop.getCode());
  193 + }
179 flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data); 194 flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data);
180 } 195 }
181 196