|
@@ -19,6 +19,8 @@ import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
|
|
import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
|
|
import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
|
|
import com.jeeplus.modules.sg.materialmodule.activiti.service.MaterialModuleService;
|
|
import com.jeeplus.modules.sg.materialmodule.activiti.service.MaterialModuleService;
|
|
import com.jeeplus.modules.sg.picking.activiti.entity.PickApplication;
|
|
import com.jeeplus.modules.sg.picking.activiti.entity.PickApplication;
|
|
|
|
+import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
|
|
|
|
+import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
|
|
import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
|
|
import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
|
|
import org.activiti.bpmn.model.BpmnModel;
|
|
import org.activiti.bpmn.model.BpmnModel;
|
|
import org.activiti.engine.FormService;
|
|
import org.activiti.engine.FormService;
|
|
@@ -2573,6 +2575,11 @@ public class ActTaskService extends BaseService {
|
|
act.preUpdate();
|
|
act.preUpdate();
|
|
// 对不同环节的业务逻辑进行操作
|
|
// 对不同环节的业务逻辑进行操作
|
|
String taskDefKey = act.getTaskDefKey();
|
|
String taskDefKey = act.getTaskDefKey();
|
|
|
|
+ ShowList showList = new ShowList();
|
|
|
|
+ showList.setAct(act);
|
|
|
|
+ List<ShowList> newTemList = showListService.findNewTemList(showList);
|
|
|
|
+ PickIngService pickIngService = new PickIngService();
|
|
|
|
+ pickIngService.processList(newTemList);
|
|
Project wzUser = MyActiviUtils.findWZUser(act.getProcInsId());
|
|
Project wzUser = MyActiviUtils.findWZUser(act.getProcInsId());
|
|
// 提交流程任务
|
|
// 提交流程任务
|
|
Map<String, Object> vars = Maps.newHashMap();
|
|
Map<String, Object> vars = Maps.newHashMap();
|