Kaynağa Gözat

提前施工,提前领料

yue 5 yıl önce
ebeveyn
işleme
0b4054b46c

+ 3 - 3
src/main/java/com/jeeplus/modules/sg/picking/activiti/web/PickIngController.java

@@ -372,7 +372,7 @@ public class PickIngController extends BaseController {
     }
 
     /**
-     * 领料流程发起
+     * 提前施工流程发起
      */
     @ResponseBody
     @RequestMapping(value = "save")
@@ -463,8 +463,8 @@ public class PickIngController extends BaseController {
         String s = constructionService.nameFindOffice(loginName);
         if ("配网政策处理专职".equals(s)) {
             vars.put("full", true);
-            Project user = MyActiviUtils.findUser(pickApplication.getAct().getProcInsId());
-            vars.put("manager", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
+            Project project = projectService.get(pickApplication.getProjectId());
+            vars.put("manager", UserUtils.getByUserName(project.getProjectManageRole()).getLoginName());
             j.setMsg("发起流程审批成功!");
         } else {
             showListService.projectUpdate(pickApplication);

+ 1 - 1
src/main/webapp/webpage/modules/sg/advence/activiti/constructionAdvanceForm.jsp

@@ -37,7 +37,7 @@
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目名称:</label></td>
 								<td class="width-35">
 									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataAdvance" id="project" name="projectId" value="${construction.projectName}" labelName="project.requireName" labelValue="${construction.projectName}"
-													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projectId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}|${fns:urlEncode('工程编号')}|${fns:urlEncode('项目名称')}|${fns:urlEncode('项目定义号')}" searchKeys="requireName|projectId|projectName|projectNumber"  isMultiSelected="true"></sys:itemselect>
+													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projectId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}|${fns:urlEncode('工程编号')}|${fns:urlEncode('项目名称')}|${fns:urlEncode('项目定义号')}" searchKeys="requireName|projectId|projectName|projectNumber"  isMultiSelected="false"></sys:itemselect>
 								</td>
 							</tr>
 							<tr>