|
|
@@ -25,6 +25,7 @@ import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
|
|
|
import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
|
|
|
import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
|
|
|
import com.jeeplus.modules.sg.materialmodule.activiti.service.MaterialModuleService;
|
|
|
+import com.jeeplus.modules.sg.picking.activiti.entity.MaterialReport;
|
|
|
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;
|
|
|
@@ -2574,14 +2575,14 @@ public class ActTaskService extends BaseService {
|
|
|
// 提交流程任务
|
|
|
Map<String, Object> vars = Maps.newHashMap();
|
|
|
vars.put("person", "shenc2");
|
|
|
- PickApplication pickApplication = new PickApplication();
|
|
|
- pickApplication.preInsert();
|
|
|
- pickApplication.setProjectId(reserveName);
|
|
|
+ //保存物料上报流程信息
|
|
|
+ MaterialReport materialReport = new MaterialReport();
|
|
|
+ materialReport.setProjectName(reserveName);
|
|
|
//保存流程定义
|
|
|
- showListService.newSave(pickApplication);
|
|
|
+ showListService.materialReportSave(materialReport);
|
|
|
ProcessDefinition p = actProcessService.getProcessDefinition(act.getProcDefId());
|
|
|
String title = UserUtils.getUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
|
|
|
- String procInsId = actTaskService.startProcessNew(p.getKey(), "md_picking_application", pickApplication.getId(), title, vars);
|
|
|
+ String procInsId = actTaskService.startProcessNew(p.getKey(), "md_material_report_application", materialReport.getId(), title, vars);
|
|
|
List<ShowList> showLists = MyActiviUtils.finaList(selectNumber);
|
|
|
for (ShowList a : showLists) {
|
|
|
a.preInsert();
|
|
|
@@ -2641,6 +2642,8 @@ public class ActTaskService extends BaseService {
|
|
|
materialProjectMapper.insertList(materialProjects);
|
|
|
//添加月度物资上报明细
|
|
|
materialInfoMapper.insertList(materialInfos);
|
|
|
+ //原始数据
|
|
|
+ materialInfoMapper.insertOldList(materialInfos);
|
|
|
//根据流程删除临时表
|
|
|
pickIngService.deleteProcInsIdMaterialReport(act.getProcInsId());
|
|
|
}
|
Enford