|
@@ -353,7 +353,7 @@ public class PickIngController extends BaseController {
|
|
showList.setsVersion(value);
|
|
showList.setsVersion(value);
|
|
}
|
|
}
|
|
//新增或编辑表单保存
|
|
//新增或编辑表单保存
|
|
-// showListService.save(showList);//保存
|
|
|
|
|
|
+ showListService.save(showList);//保存
|
|
//查询项目的领料状态是否不为0
|
|
//查询项目的领料状态是否不为0
|
|
String acqStatus = showListService.findAcqStatus(showList);
|
|
String acqStatus = showListService.findAcqStatus(showList);
|
|
if ("0".equals(acqStatus)) {
|
|
if ("0".equals(acqStatus)) {
|
|
@@ -361,11 +361,11 @@ public class PickIngController extends BaseController {
|
|
}
|
|
}
|
|
//修改项目的状态
|
|
//修改项目的状态
|
|
// 启动流程
|
|
// 启动流程
|
|
-/* Map<String, Object> vars = Maps.newHashMap();
|
|
|
|
|
|
+ Map<String, Object> vars = Maps.newHashMap();
|
|
vars.put("manager", UserUtils.getUser().getLoginName());
|
|
vars.put("manager", UserUtils.getUser().getLoginName());
|
|
ProcessDefinition p = actProcessService.getProcessDefinition(showList.getAct().getProcDefId());
|
|
ProcessDefinition p = actProcessService.getProcessDefinition(showList.getAct().getProcDefId());
|
|
String title = showList.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
|
|
String title = showList.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
|
|
- actTaskService.startProcess(p.getKey(), "md_acquisition_process", showList.getId(), title, vars);*/
|
|
|
|
|
|
+ actTaskService.startProcess(p.getKey(), "md_acquisition_process", showList.getId(), title, vars);
|
|
j.setMsg("发起领料流程成功!");
|
|
j.setMsg("发起领料流程成功!");
|
|
j.getBody().put("targetUrl", "/act/task/process/");
|
|
j.getBody().put("targetUrl", "/act/task/process/");
|
|
|
|
|