政策处理专职和项目经理允许对项目发起开具领料单申请，政策处理专职发起必须由项目经理审核

设计变更需求方为谁谁附设计方案图

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -14,6 +14,8 @@ import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ProcessPersonnelService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.picking.activiti.entity.PickApplication;
+import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.engine.FormService;
 import org.activiti.engine.HistoryService;
@@ -99,9 +101,7 @@ public class ActTaskService extends BaseService {
 	@Autowired
 	private ConstructionService constructionService;
 	@Autowired
-	private DiscloseService discloseService;
-	@Autowired
-	private ProcessPersonnelService processPersonnelService;
+	private ShowListService showListService;
 	/**
 	 * 获取待办任务列表
 	 * @return
@@ -1236,33 +1236,33 @@ public class ActTaskService extends BaseService {
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void operator(Act act,String design) {
+	public void operator(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
-		//根据登陆查询所属的角色
 		String flag = act.getFlag();
-		//根据登陆查询所属的角色
-		String s = constructionService.nameFindOffice(design);
 		vars.put("jys", false);
 		vars.put("des", false);
 		vars.put("manager", false);
 		if ("yes".equals(flag)) {
-			//判断角色属于哪里
-			if ("经研所".equals(s)) {
+			//获取流程id
+			String procInsId = act.getProcInsId();
+			Project user = MyActiviUtils.findUser(procInsId);
+			//查询需求提出单位
+			String demandUnit = user.getDemandUnit();
+			if ("经研所".equals(demandUnit)) {
+				vars.put("design",user.getThroughResearchRole());
 				vars.put("jys", true);
-			} else if ("设计单位人员".equals(s)) {
+			} else {
+				vars.put("design",user.getThroughResearchRole());
 				vars.put("des", true);
 			}
-			vars.put("design", design);
 		} else {
 			vars.put("manager", true);
 			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理人工判断问题");
 			String manager = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理组织交底");
 			 if (manager2!=null&&manager2!="") {
 				vars.put("design",manager2);
-				System.out.println(manager2);
 			}else if (manager!=null&&manager!="") {
 				 vars.put("design",manager);
-				 System.out.println(manager);
 			 }
 		}
 		// 设置意见
@@ -1280,10 +1280,10 @@ public class ActTaskService extends BaseService {
 	@Transactional(readOnly = false)
 	public void managerDesign(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
-		//根据登陆查询所属的角色
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		String flag = act.getFlag();
 		if ("yes".equals(flag)) {
-			vars.put("design", "运行人员");
+			vars.put("design", user.getRunUnitRole());
 		} else {
 
 		}
@@ -2245,4 +2245,54 @@ public class ActTaskService extends BaseService {
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
+	/**
+	 * 保存审核意见
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void auditDrawings(Act act) {
+		// 设置意见
+		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		vars.put("pass", "yes".equals(act.getFlag())? true : false);
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
+		String constructionUnitRole = user.getConstructionUnitRole();
+		vars.put("manager",constructionUnitRole);
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+
+	/**
+	 * 保存审核意见
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void applicationAudit(Act act) {
+		// 设置意见
+		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		String info = "";
+		//选择项目发起请求
+		String flag = act.getFlag();
+		String procInsId = act.getProcInsId();
+		Project nameByInsID = constructionService.findNameByInsID(procInsId);
+		if ("yes".equals(flag)) {
+			PickApplication pickApplication = new PickApplication();
+			pickApplication.setProjectId(nameByInsID.getId());
+			info = nameByInsID.getRequireName() + "项目通过审核";
+			showListService.projectUpdate(pickApplication);
+		} else {
+			info = nameByInsID.getRequireName() + "项目没有通过审核";
+		}
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
 }

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -28,6 +28,7 @@ import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ProcessPersonnelService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
@@ -601,27 +602,9 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "operator")
-	public AjaxJson operator(Act act, String design, String pic, UploadImages uploadImages) {
+	public AjaxJson operator(Act act, String pic, UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
-		//获取流程id
-		String procInsId = act.getProcInsId();
-		//根据流程id获取项目需求提出单位
-		String demandUnit = constructionService.demandUnit(procInsId);
-		//根据选择的用户询用户角色
-		String nameFindOffice = constructionService.nameFindOffice(design);
-		if (demandUnit.indexOf("经研所")>0) {
-			if (!"经研所".equals(nameFindOffice)) {
-				j.setSuccess(false);
-				j.setMsg("此项目的需求方是经研所，请选择对应的人员");
-				return j;
-			}
-		} else {
-			if ("经研所".equals(nameFindOffice)) {
-				j.setSuccess(false);
-				j.setMsg("此项目需求单位不是经研所，请选择对应的人员");
-				return j;
-			}
-		}
+
 		try {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);
@@ -632,7 +615,7 @@ public class ActTaskController extends BaseController {
 			}
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
-			actTaskService.operator(act,design);
+			actTaskService.operator(act);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
@@ -1249,6 +1232,42 @@ public class ActTaskController extends BaseController {
 		j.setMsg("审批成功");
 		return j;
 	}
-	//constructionLeader
+
+
+	/**
+	 * 运行人员审核图纸
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "auditDrawings")
+	public AjaxJson auditDrawings(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.auditDrawings(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
+	 * 项目经理审核流程提前领料是否通过
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "applicationAudit")
+	public AjaxJson applicationAudit(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.applicationAudit(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
 
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/ConstructionMapper.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.sg.managementcenter.activiti.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.test.activiti.entity.OALeave;
 import org.apache.ibatis.annotations.Param;
@@ -38,4 +39,6 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
     //根据流程定义号查询项目需求名称
     String idProjectName(@Param("procInsId") String procInsId);
 
+    Project findNameByInsID(String procInsId);
+
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/ConstructionMapper.xml

@@ -274,4 +274,7 @@
 	<select id="idProjectName" resultType="string">
 		select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId};
 	</select>
+	<select id="findNameByInsID" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
+		select id,require_name from xm_project_details where id =  (select project_id from md_picking_application where proc_ins_id  = #{id})
+	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/ConstructionService.java

@@ -7,6 +7,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.mapper.ConstructionMapper;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.test.activiti.entity.OALeave;
 import com.jeeplus.modules.test.activiti.mapper.OALeaveMapper;
@@ -88,4 +89,11 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		return s;
 	}
 
+	/**
+	 * 根据流程定义号查询提前物料申请流程的项目名称
+	 * */
+	public Project findNameByInsID(String procInsId) {
+		return constructionMapper.findNameByInsID(procInsId);
+	}
+
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/entity/Project.java

@@ -60,6 +60,7 @@ public class Project extends DataEntity<Project> {
     private String acquisitionStatus;//领料状态
     private String constructionStatus;//施工状态
     private String whetherCloseStatus;//是否项目关闭
+    private Integer earlyMaterial;//判断项目是否可以提前发起领料
 
     public String getStatus() {
         return status;
@@ -93,7 +94,7 @@ public class Project extends DataEntity<Project> {
         this.whetherCloseStatus = whetherCloseStatus;
     }
 
-    @ExcelField(title="类型", align=2, sort=1)
+    @ExcelField(title = "类型", align = 2, sort = 1)
     public String getType() {
         return type;
     }
@@ -102,7 +103,7 @@ public class Project extends DataEntity<Project> {
         this.type = type;
     }
 
-    @ExcelField(title="需求提出单位", align=2, sort=2)
+    @ExcelField(title = "需求提出单位", align = 2, sort = 2)
     public String getDemandUnit() {
         return demandUnit;
     }
@@ -110,7 +111,8 @@ public class Project extends DataEntity<Project> {
     public void setDemandUnit(String demandUnit) {
         this.demandUnit = demandUnit;
     }
-    @ExcelField(title="变电站名称", align=2, sort=3)
+
+    @ExcelField(title = "变电站名称", align = 2, sort = 3)
     public String getBdzName() {
         return bdzName;
     }
@@ -118,7 +120,8 @@ public class Project extends DataEntity<Project> {
     public void setBdzName(String bdzName) {
         this.bdzName = bdzName;
     }
-    @ExcelField(title="线路名称", align=2, sort=4)
+
+    @ExcelField(title = "线路名称", align = 2, sort = 4)
     public String getLineName() {
         return lineName;
     }
@@ -126,12 +129,13 @@ public class Project extends DataEntity<Project> {
     public void setLineName(String lineName) {
         this.lineName = lineName;
     }
-    @ExcelField(title="项目需求名称", align=2, sort=5)
+
+    @ExcelField(title = "项目需求名称", align = 2, sort = 5)
     public String getRequireName() {
         return requireName;
     }
 
-    @ExcelField(title="工程编号", align=2, sort=6)
+    @ExcelField(title = "工程编号", align = 2, sort = 6)
     public String getProjectId() {
         return projectId;
     }
@@ -139,7 +143,8 @@ public class Project extends DataEntity<Project> {
     public void setProjectId(String projectId) {
         this.projectId = projectId;
     }
-    @ExcelField(title="项目名称", align=2, sort=7)
+
+    @ExcelField(title = "项目名称", align = 2, sort = 7)
     public String getProjectName() {
         return projectName;
     }
@@ -147,7 +152,8 @@ public class Project extends DataEntity<Project> {
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
-    @ExcelField(title="项目定义号", align=2, sort=8)
+
+    @ExcelField(title = "项目定义号", align = 2, sort = 8)
     public String getProjectNumber() {
         return projectNumber;
     }
@@ -155,12 +161,13 @@ public class Project extends DataEntity<Project> {
     public void setProjectNumber(String projectNumber) {
         this.projectNumber = projectNumber;
     }
-    @ExcelField(title="项目经理角色", align=2, sort=9)
+
+    @ExcelField(title = "项目经理角色", align = 2, sort = 9)
     public String getProjectManageRole() {
         return projectManageRole;
     }
 
-    @ExcelField(title="配网工程专职角色", align=2, sort=10)
+    @ExcelField(title = "配网工程专职角色", align = 2, sort = 10)
     public String getDistributionEngineering() {
         return distributionEngineering;
     }
@@ -168,7 +175,8 @@ public class Project extends DataEntity<Project> {
     public void setDistributionEngineering(String distributionEngineering) {
         this.distributionEngineering = distributionEngineering;
     }
-    @ExcelField(title="配网物资专职角色", align=2, sort=11)
+
+    @ExcelField(title = "配网物资专职角色", align = 2, sort = 11)
     public String getDistributionMaterials() {
         return distributionMaterials;
     }
@@ -176,7 +184,8 @@ public class Project extends DataEntity<Project> {
     public void setDistributionMaterials(String distributionMaterials) {
         this.distributionMaterials = distributionMaterials;
     }
-    @ExcelField(title="配网系统专职角色", align=2, sort=12)
+
+    @ExcelField(title = "配网系统专职角色", align = 2, sort = 12)
     public String getDistributionSystem() {
         return distributionSystem;
     }
@@ -184,7 +193,8 @@ public class Project extends DataEntity<Project> {
     public void setDistributionSystem(String distributionSystem) {
         this.distributionSystem = distributionSystem;
     }
-    @ExcelField(title="配网政策处理专职角色", align=2, sort=13)
+
+    @ExcelField(title = "配网政策处理专职角色", align = 2, sort = 13)
     public String getDistributionPolicy() {
         return distributionPolicy;
     }
@@ -192,7 +202,8 @@ public class Project extends DataEntity<Project> {
     public void setDistributionPolicy(String distributionPolicy) {
         this.distributionPolicy = distributionPolicy;
     }
-    @ExcelField(title="项目管理中心领导角色", align=2, sort=14)
+
+    @ExcelField(title = "项目管理中心领导角色", align = 2, sort = 14)
     public String getManagementLeader() {
         return managementLeader;
     }
@@ -200,7 +211,8 @@ public class Project extends DataEntity<Project> {
     public void setManagementLeader(String managementLeader) {
         this.managementLeader = managementLeader;
     }
-    @ExcelField(title="运行单位", align=2, sort=15)
+
+    @ExcelField(title = "运行单位", align = 2, sort = 15)
     public String getRunUnit() {
         return runUnit;
     }
@@ -208,7 +220,8 @@ public class Project extends DataEntity<Project> {
     public void setRunUnit(String runUnit) {
         this.runUnit = runUnit;
     }
-    @ExcelField(title="运行单位角色", align=2, sort=16)
+
+    @ExcelField(title = "运行单位角色", align = 2, sort = 16)
     public String getRunUnitRole() {
         return runUnitRole;
     }
@@ -216,7 +229,8 @@ public class Project extends DataEntity<Project> {
     public void setRunUnitRole(String runUnitRole) {
         this.runUnitRole = runUnitRole;
     }
-    @ExcelField(title="经研所角色", align=2, sort=17)
+
+    @ExcelField(title = "经研所角色", align = 2, sort = 17)
     public String getThroughResearchRole() {
         return throughResearchRole;
     }
@@ -228,7 +242,8 @@ public class Project extends DataEntity<Project> {
     public void setProjectManageRole(String projectManageRole) {
         this.projectManageRole = projectManageRole;
     }
-    @ExcelField(title="施工单位", align=2, sort=18)
+
+    @ExcelField(title = "施工单位", align = 2, sort = 18)
     public String getConstructionUnit() {
         return constructionUnit;
     }
@@ -236,11 +251,13 @@ public class Project extends DataEntity<Project> {
     public void setConstructionUnit(String constructionUnit) {
         this.constructionUnit = constructionUnit;
     }
-    @ExcelField(title="施工单位角色", align=2, sort=19)
+
+    @ExcelField(title = "施工单位角色", align = 2, sort = 19)
     public String getConstructionUnitRole() {
         return constructionUnitRole;
     }
-    @ExcelField(title="设计单位", align=2, sort=20)
+
+    @ExcelField(title = "设计单位", align = 2, sort = 20)
     public String getDesignUnit() {
         return designUnit;
     }
@@ -248,7 +265,8 @@ public class Project extends DataEntity<Project> {
     public void setDesignUnit(String designUnit) {
         this.designUnit = designUnit;
     }
-    @ExcelField(title="设计单位角色", align=2, sort=21)
+
+    @ExcelField(title = "设计单位角色", align = 2, sort = 21)
     public String getDesignUnitRole() {
         return designUnitRole;
     }
@@ -260,7 +278,8 @@ public class Project extends DataEntity<Project> {
     public void setConstructionUnitRole(String constructionUnitRole) {
         this.constructionUnitRole = constructionUnitRole;
     }
-    @ExcelField(title="交底类型", align=2, sort=22)
+
+    @ExcelField(title = "交底类型", align = 2, sort = 22)
     public String getClarificaitonType() {
         return clarificaitonType;
     }
@@ -272,7 +291,8 @@ public class Project extends DataEntity<Project> {
     public void setRequireName(String requireName) {
         this.requireName = requireName;
     }
-    @ExcelField(title="建设理由分类", align=2, sort=23)
+
+    @ExcelField(title = "建设理由分类", align = 2, sort = 23)
     public String getBulidClassificationResons() {
         return bulidClassificationResons;
     }
@@ -280,7 +300,8 @@ public class Project extends DataEntity<Project> {
     public void setBulidClassificationResons(String bulidClassificationResons) {
         this.bulidClassificationResons = bulidClassificationResons;
     }
-    @ExcelField(title="建设理由", align=2, sort=24)
+
+    @ExcelField(title = "建设理由", align = 2, sort = 24)
     public String getBulbidResons() {
         return bulbidResons;
     }
@@ -288,7 +309,8 @@ public class Project extends DataEntity<Project> {
     public void setBulbidResons(String bulbidResons) {
         this.bulbidResons = bulbidResons;
     }
-    @ExcelField(title="设备基本情况", align=2, sort=25)
+
+    @ExcelField(title = "设备基本情况", align = 2, sort = 25)
     public String getAsicEquipment() {
         return asicEquipment;
     }
@@ -296,7 +318,8 @@ public class Project extends DataEntity<Project> {
     public void setAsicEquipment(String asicEquipment) {
         this.asicEquipment = asicEquipment;
     }
-    @ExcelField(title="运行班", align=2, sort=26)
+
+    @ExcelField(title = "运行班", align = 2, sort = 26)
     public String getRunTheClass() {
         return runTheClass;
     }
@@ -304,7 +327,8 @@ public class Project extends DataEntity<Project> {
     public void setRunTheClass(String runTheClass) {
         this.runTheClass = runTheClass;
     }
-    @ExcelField(title="项目组", align=2, sort=27)
+
+    @ExcelField(title = "项目组", align = 2, sort = 27)
     public String getProjectTeam() {
         return projectTeam;
     }
@@ -312,7 +336,8 @@ public class Project extends DataEntity<Project> {
     public void setProjectTeam(String projectTeam) {
         this.projectTeam = projectTeam;
     }
-    @ExcelField(title="费用估算", align=2, sort=28)
+
+    @ExcelField(title = "费用估算", align = 2, sort = 28)
     public Double getCostEstimate() {
         return costEstimate;
     }
@@ -320,7 +345,8 @@ public class Project extends DataEntity<Project> {
     public void setCostEstimate(Double costEstimate) {
         this.costEstimate = costEstimate;
     }
-    @ExcelField(title="是否迎风期度夏项目", align=2, sort=29)
+
+    @ExcelField(title = "是否迎风期度夏项目", align = 2, sort = 29)
     public String getWhetherRheUpwind() {
         return whetherRheUpwind;
     }
@@ -328,7 +354,8 @@ public class Project extends DataEntity<Project> {
     public void setWhetherRheUpwind(String whetherRheUpwind) {
         this.whetherRheUpwind = whetherRheUpwind;
     }
-    @ExcelField(title="确定下达时间", align=2, sort=30)
+
+    @ExcelField(title = "确定下达时间", align = 2, sort = 30)
     public String getSureDaDate() {
         return sureDaDate;
     }
@@ -337,7 +364,7 @@ public class Project extends DataEntity<Project> {
         this.sureDaDate = sureDaDate;
     }
 
-    @ExcelField(title="备注", align=2, sort=31)
+    @ExcelField(title = "备注", align = 2, sort = 31)
     public String getTextRemark() {
         return textRemark;
     }
@@ -350,7 +377,7 @@ public class Project extends DataEntity<Project> {
         this.textRemark = textRemark;
     }
 
-    @ExcelField(title="停电线路", align=2, sort=32)
+    @ExcelField(title = "停电线路", align = 2, sort = 32)
     public String getPowerLine() {
         return powerLine;
     }
@@ -358,7 +385,8 @@ public class Project extends DataEntity<Project> {
     public void setPowerLine(String powerLine) {
         this.powerLine = powerLine;
     }
-    @ExcelField(title="停电范围", align=2, sort=33)
+
+    @ExcelField(title = "停电范围", align = 2, sort = 33)
     public String getPowerScope() {
         return powerScope;
     }
@@ -366,7 +394,8 @@ public class Project extends DataEntity<Project> {
     public void setPowerScope(String powerScope) {
         this.powerScope = powerScope;
     }
-    @ExcelField(title="项目类型", align=2, sort=34)
+
+    @ExcelField(title = "项目类型", align = 2, sort = 34)
     public String getProjectType() {
         return projectType;
     }
@@ -374,7 +403,8 @@ public class Project extends DataEntity<Project> {
     public void setProjectType(String projectType) {
         this.projectType = projectType;
     }
-    @ExcelField(title="是否为停电打包项目", align=2, sort=35)
+
+    @ExcelField(title = "是否为停电打包项目", align = 2, sort = 35)
     public String getPowerFlagPackage() {
         return powerFlagPackage;
     }
@@ -382,7 +412,8 @@ public class Project extends DataEntity<Project> {
     public void setPowerFlagPackage(String powerFlagPackage) {
         this.powerFlagPackage = powerFlagPackage;
     }
-    @ExcelField(title="证处初步判断", align=2, sort=36)
+
+    @ExcelField(title = "证处初步判断", align = 2, sort = 36)
     public String getPreliminaryJudgment() {
         return preliminaryJudgment;
     }
@@ -390,7 +421,8 @@ public class Project extends DataEntity<Project> {
     public void setPreliminaryJudgment(String preliminaryJudgment) {
         this.preliminaryJudgment = preliminaryJudgment;
     }
-    @ExcelField(title="是否含土建（不含钢管杆）", align=2, sort=37)
+
+    @ExcelField(title = "是否含土建（不含钢管杆）", align = 2, sort = 37)
     public String getFlagCivilEngineering() {
         return flagCivilEngineering;
     }
@@ -398,7 +430,8 @@ public class Project extends DataEntity<Project> {
     public void setFlagCivilEngineering(String flagCivilEngineering) {
         this.flagCivilEngineering = flagCivilEngineering;
     }
-    @ExcelField(title="钢管杆基础类型", align=2, sort=38)
+
+    @ExcelField(title = "钢管杆基础类型", align = 2, sort = 38)
     public String getSteelTubePole() {
         return steelTubePole;
     }
@@ -406,7 +439,8 @@ public class Project extends DataEntity<Project> {
     public void setSteelTubePole(String steelTubePole) {
         this.steelTubePole = steelTubePole;
     }
-    @ExcelField(title="是否需要规矩报批", align=2, sort=39)
+
+    @ExcelField(title = "是否需要规矩报批", align = 2, sort = 39)
     public String getFlagApprovalPlanning() {
         return flagApprovalPlanning;
     }
@@ -414,7 +448,8 @@ public class Project extends DataEntity<Project> {
     public void setFlagApprovalPlanning(String flagApprovalPlanning) {
         this.flagApprovalPlanning = flagApprovalPlanning;
     }
-    @ExcelField(title="设备改造类型", align=2, sort=40)
+
+    @ExcelField(title = "设备改造类型", align = 2, sort = 40)
     public String getEquCreateType() {
         return equCreateType;
     }
@@ -422,7 +457,8 @@ public class Project extends DataEntity<Project> {
     public void setEquCreateType(String equCreateType) {
         this.equCreateType = equCreateType;
     }
-    @ExcelField(title="改造设备尺寸及间隔数", align=2, sort=41)
+
+    @ExcelField(title = "改造设备尺寸及间隔数", align = 2, sort = 41)
     public String getEquCreateSize() {
         return equCreateSize;
     }
@@ -430,7 +466,8 @@ public class Project extends DataEntity<Project> {
     public void setEquCreateSize(String equCreateSize) {
         this.equCreateSize = equCreateSize;
     }
-    @ExcelField(title="是否新设备命名", align=2, sort=42)
+
+    @ExcelField(title = "是否新设备命名", align = 2, sort = 42)
     public String getFlagNewEquName() {
         return flagNewEquName;
     }
@@ -438,7 +475,8 @@ public class Project extends DataEntity<Project> {
     public void setFlagNewEquName(String flagNewEquName) {
         this.flagNewEquName = flagNewEquName;
     }
-    @ExcelField(title="是否含变电站新闻隔投运", align=2, sort=43)
+
+    @ExcelField(title = "是否含变电站新闻隔投运", align = 2, sort = 43)
     public String getIncludeBdzNews() {
         return includeBdzNews;
     }
@@ -446,7 +484,8 @@ public class Project extends DataEntity<Project> {
     public void setIncludeBdzNews(String includeBdzNews) {
         this.includeBdzNews = includeBdzNews;
     }
-    @ExcelField(title="是否非涉电电气施工", align=2, sort=44)
+
+    @ExcelField(title = "是否非涉电电气施工", align = 2, sort = 44)
     public String getFlagNoElectrical() {
         return flagNoElectrical;
     }
@@ -454,7 +493,8 @@ public class Project extends DataEntity<Project> {
     public void setFlagNoElectrical(String flagNoElectrical) {
         this.flagNoElectrical = flagNoElectrical;
     }
-    @ExcelField(title="图纸标注的带点作业情况", align=2, sort=45)
+
+    @ExcelField(title = "图纸标注的带点作业情况", align = 2, sort = 45)
     public String getDrawingsWork() {
         return drawingsWork;
     }
@@ -462,7 +502,8 @@ public class Project extends DataEntity<Project> {
     public void setDrawingsWork(String drawingsWork) {
         this.drawingsWork = drawingsWork;
     }
-    @ExcelField(title="是否含自动化", align=2, sort=46)
+
+    @ExcelField(title = "是否含自动化", align = 2, sort = 46)
     public String getFlagAutomation() {
         return flagAutomation;
     }
@@ -470,7 +511,8 @@ public class Project extends DataEntity<Project> {
     public void setFlagAutomation(String flagAutomation) {
         this.flagAutomation = flagAutomation;
     }
-    @ExcelField(title="二摇或三摇", align=2, sort=47)
+
+    @ExcelField(title = "二摇或三摇", align = 2, sort = 47)
     public String getTwoAndThreeRemote() {
         return twoAndThreeRemote;
     }
@@ -478,7 +520,8 @@ public class Project extends DataEntity<Project> {
     public void setTwoAndThreeRemote(String twoAndThreeRemote) {
         this.twoAndThreeRemote = twoAndThreeRemote;
     }
-    @ExcelField(title="通信方式", align=2, sort=48)
+
+    @ExcelField(title = "通信方式", align = 2, sort = 48)
     public String getPhoneStyle() {
         return phoneStyle;
     }
@@ -486,7 +529,8 @@ public class Project extends DataEntity<Project> {
     public void setPhoneStyle(String phoneStyle) {
         this.phoneStyle = phoneStyle;
     }
-    @ExcelField(title="柱开集中或就业地", align=2, sort=49)
+
+    @ExcelField(title = "柱开集中或就业地", align = 2, sort = 49)
     public String getStayOpenArea() {
         return stayOpenArea;
     }
@@ -494,7 +538,8 @@ public class Project extends DataEntity<Project> {
     public void setStayOpenArea(String stayOpenArea) {
         this.stayOpenArea = stayOpenArea;
     }
-    @ExcelField(title="环网柜", align=2, sort=50)
+
+    @ExcelField(title = "环网柜", align = 2, sort = 50)
     public String getRingNetworkCabinet() {
         return ringNetworkCabinet;
     }
@@ -502,7 +547,8 @@ public class Project extends DataEntity<Project> {
     public void setRingNetworkCabinet(String ringNetworkCabinet) {
         this.ringNetworkCabinet = ringNetworkCabinet;
     }
-    @ExcelField(title="站房DTU", align=2, sort=51)
+
+    @ExcelField(title = "站房DTU", align = 2, sort = 51)
     public String getStationDtu() {
         return stationDtu;
     }
@@ -511,4 +557,11 @@ public class Project extends DataEntity<Project> {
         this.stationDtu = stationDtu;
     }
 
+    public Integer getEarlyMaterial() {
+        return earlyMaterial;
+    }
+
+    public void setEarlyMaterial(Integer earlyMaterial) {
+        this.earlyMaterial = earlyMaterial;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -79,8 +79,8 @@
 	</select>
 	
 	<select id="findList" resultType="Project" >
-		SELECT 
-			<include refid="projectColumns"/>
+		SELECT
+		<include refid="projectColumns"/>
 		FROM xm_project_details a
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
@@ -97,6 +97,9 @@
 			<if test="requireName != null and  requireName != ''">
 				AND a.require_name LIKE CONCAT(CONCAT('%',#{requireName},'%'))
 			</if>
+			<if test="earlyMaterial != null and  earlyMaterial != ''">
+				or a.earlyMaterial = #{earlyMaterial}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -508,4 +511,6 @@
 		FROM xm_project_details
 		WHERE require_name = (select project_name from xm_construction_clarificaiton where proc_ins_id=#{procInsId});
 	</select>
+
+
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -29,7 +29,8 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	private ProjectMapper projectMapper;
 
 	public Project get(String id) {
-		return super.get(id);
+		Project project = super.get(id);
+		return project;
 	}
 	
 	public List<Project> findList(Project project) {

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -93,16 +93,31 @@ public class ProjectController extends BaseController {
 		return getBootstrapData(page);
 	}
 
-
+	/**
+	 * 领料模块项目选择框
+	 * */
 	@ResponseBody
 	@RequestMapping(value = "dataPicking")
 	public Map<String, Object> dataPicking(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
 		project.setStatus("2");
 		project.setWhetherCloseStatus("0");
+		project.setEarlyMaterial(1);
+		Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
+		return getBootstrapData(page);
+	}
+
+	/**
+	 * 领料申请项目选择框
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "pickingApplication")
+	public Map<String, Object> pickingApplication(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
 		Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
 		return getBootstrapData(page);
 	}
 
+
+
 	/**
 	 * 查看，增加，编辑表单表单页面
 	 */

src/main/java/com/jeeplus/modules/sg/picking/activiti/entity/PickApplication.java

@@ -0,0 +1,15 @@
+package com.jeeplus.modules.sg.picking.activiti.entity;
+
+import com.jeeplus.core.persistence.ActEntity;
+
+public class PickApplication extends ActEntity<PickApplication> {
+    private String projectId;
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+}

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/ShowListMapper.java

@@ -5,6 +5,7 @@ package com.jeeplus.modules.sg.picking.activiti.mapper;
 
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.picking.activiti.entity.PickApplication;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickIng;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
 
@@ -19,5 +20,14 @@ import java.util.List;
 @MyBatisMapper
 public interface ShowListMapper extends BaseMapper<ShowList> {
     String findNumber(String projectId);
-    public List<ShowList> findNewList(ShowList entity);
+//    public List<ShowList> findNewList(ShowList entity);
+
+    /**
+     * 保存项目提前领料流程信息
+     */
+    void newSave(PickApplication pickApplication);
+
+    void projectUpdate(PickApplication pickApplication);
+
+    String selectProjectId(String id);
 }

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/ShowListMapper.xml

@@ -112,4 +112,37 @@
 	<select id="findNumber" resultType="string">
 		select the_number from md_acquisition_process where project_id = #{projectId} order by the_number DESC LIMIT 1;
 	</select>
+
+	<insert id="newSave">
+		INSERT INTO md_picking_application(
+			id,
+			proc_ins_id,
+			project_id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag
+		) VALUES (
+			#{id},
+			#{procInsId},
+			#{projectId},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag}
+		)
+	</insert>
+
+	<update id="projectUpdate">
+		update xm_project_details set earlyMaterial=1
+		where id=#{projectId};
+	</update>
+
+	<select id="selectProjectId" resultType="string">
+		select project_id from md_picking_application where id =#{id}
+	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/picking/activiti/service/ShowListService.java

@@ -33,15 +33,36 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 	}
 
 
-	public Page<ShowList> findNewPage(Page<ShowList> page, ShowList entity) {
+/*	public Page<ShowList> findNewPage(Page<ShowList> page, ShowList entity) {
 		dataRuleFilter(entity);
 		entity.setPage(page);
 		page.setList(mapper.findNewList(entity));
 		return page;
-	}
+	}*/
 
 
 	public String findNumber(String projectId) {
 		return showListMapper.findNumber(projectId);
 	}
+
+	/**
+	 *保存项目提前领料流程信息
+	 */
+	@Transactional(readOnly = false)
+	public void newSave(PickApplication pickApplication){
+		pickApplication.preInsert();
+		showListMapper.newSave(pickApplication);
+	};
+
+	/**
+	 *修改项目信息状态
+	 * */
+	@Transactional(readOnly = false)
+	public void projectUpdate(PickApplication pickApplication){
+		showListMapper.projectUpdate(pickApplication);
+	};
+
+	public String selectProjectId(String id){
+		return showListMapper.selectProjectId(id);
+	};
 }

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

@@ -6,15 +6,13 @@ import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
-import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
+import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import com.jeeplus.modules.sg.picking.activiti.entity.PickIng;
-import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
-import com.jeeplus.modules.sg.picking.activiti.entity.ProjectNumber;
-import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
+import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import com.jeeplus.modules.sg.picking.activiti.entity.*;
 import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
 import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -22,9 +20,7 @@ import org.activiti.engine.repository.ProcessDefinition;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
@@ -44,6 +40,10 @@ public class PickIngController extends BaseController {
     private ActProcessService actProcessService;
     @Autowired
     private ActTaskService actTaskService;
+    @Autowired
+    private ConstructionService constructionService;
+    @Autowired
+    private ProjectService projectService;
 
     /**
      * 填写项目表
@@ -67,6 +67,8 @@ public class PickIngController extends BaseController {
     @RequestMapping(value = "constructionLeader")
     public String constructionLeader(ShowList showList, Model model) {
         model.addAttribute("showList", showList);
+        ProjectNumber projectNumber = pickIngService.projectNumber(showList.getAct().getProcInsId());
+        model.addAttribute("projectNumber",projectNumber);
         return "modules/sg/picking/activiti/constructionLeader";
     }
 
@@ -109,11 +111,25 @@ public class PickIngController extends BaseController {
      * 对项目发起申请，使项目可以提前发起领料流程
      */
     @RequestMapping(value = "pickingApplication")
-    public String pickingApplication(ShowList showList, Model model) {
-        model.addAttribute("showList", showList);
+    public String pickingApplication(PickApplication pickApplication, Model model) {
+        model.addAttribute("pickApplication", pickApplication);
         return "modules/sg/picking/activiti/pickingApplication";
     }
 
+    /**
+     * 项目经理审核
+     * 政策处理专职发起项目，交与项目经理审核页面
+     */
+    @RequestMapping(value = "applicationAudit")
+    public String applicationAudit(PickApplication pickApplication, Model model) {
+        String id = pickApplication.getId();
+        String projectId = showListService.selectProjectId(id);
+        Project project = projectService.get(projectId);
+        model.addAttribute("pickApplication", pickApplication);
+        model.addAttribute("project", project);
+        return "modules/sg/picking/activiti/applicationAudit";
+    }
+
 
     //    manager
     @ResponseBody
@@ -206,7 +222,7 @@ public class PickIngController extends BaseController {
     }
 
     /**
-     * 保存申请
+     * 领料流程发起
      */
     @ResponseBody
     @RequestMapping(value = "save")
@@ -254,5 +270,54 @@ public class PickIngController extends BaseController {
         return j;
     }
 
+    /**
+     * 领料申请流程发起
+     * */
+    @ResponseBody
+    @RequestMapping(value = "pickSave")
+    public AjaxJson pickSave(PickApplication pickApplication, Model model) throws Exception {
+        AjaxJson j = new AjaxJson();
+        /**
+         * 后台hibernate-validation插件校验
+         */
+        String errMsg = beanValidator(pickApplication);
+        if (StringUtils.isNotBlank(errMsg)) {
+            j.setSuccess(false);
+            j.setMsg(errMsg);
+            return j;
+        }
+        String projectId = pickApplication.getProjectId();
+        if (projectId == null||"".equals(projectId)) {
+            j.setSuccess(false);
+            j.setMsg("请选择项目");
+            return j;
+        }
+
+        //新增或编辑表单保存
+        showListService.newSave(pickApplication);
+        // 启动流程
+        Map<String, Object> vars = Maps.newHashMap();
+        vars.put("noFull", false);
+        vars.put("full", false);
+        String loginName = UserUtils.getUser().getLoginName();
+        //配网政策处理专职
+        String s = constructionService.nameFindOffice(loginName);
+        if ("配网政策处理专职".equals(s)) {
+            vars.put("full", true);
+            vars.put("manager", "项目经理A");
+            j.setMsg("发起流程审批成功!");
+        }else {
+            showListService.projectUpdate(pickApplication);
+            vars.put("noFull", true);
+            j.setMsg("项目可发起领料流程!");
+        }
+        ProcessDefinition p = actProcessService.getProcessDefinition(pickApplication.getAct().getProcDefId());
+        String title = pickApplication.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+        actTaskService.startProcess(p.getKey(), "md_picking_application", pickApplication.getId(), title, vars);
+        j.getBody().put("targetUrl", "/act/task/process/");
+        return j;
+    }
+
+
 }
 

src/main/webapp/webpage/modules/sg/managementcenter/activiti/auditDrawings.jsp

@@ -10,35 +10,16 @@
 	<script type="text/javascript">
 
 		$(document).ready(function() {
-
+			//审核通过
 			$("#agree").click(function () {
-				var design = $("#tuserName").val();
-				var currentFileValues = $("input[name='pic']").val();
-				var currentFileValues1 = $("input[name='pic1']").val();
-				var currentFileValues2 = $("input[name='pic2']").val();
-				if (design == "" || design == null) {
-					jp.error("请选择用户");
-				}else if (currentFileValues==""||currentFileValues==null) {
-					jp.error("请上传变更后图纸");
-				}else if (currentFileValues1==""||currentFileValues1==null) {
-					jp.error("请上传预算书");
-				}else if (currentFileValues2 == "" || currentFileValues2 == null) {
-					jp.error("请上传物资清册");
-				} else {
-				// alert(design);
 				jp.prompt("审核意见", function (message) {
-					jp.post("${ctx}/act/task/designUpload",
-					{
+					jp.post("${ctx}/act/task/auditDrawings", {
 						"taskId":"${uploadImages.act.taskId}",
 						"taskName":"${uploadImages.act.taskName}",
 						"taskDefKey":"${uploadImages.act.taskDefKey}",
 						"procInsId":"${uploadImages.act.procInsId}",
 						"procDefId":"${uploadImages.act.procDefId}",
 						"flag":"yes",
-						"pic":currentFileValues,
-						"pic1":currentFileValues1,
-						"pic2": currentFileValues2,
-						"design":design,
 						"comment":window.encodeURI(message)
 					},
 					function (data) {
@@ -48,7 +29,26 @@
 						}
 					})
 				});
-				}
+			});
+			//审核不通过
+			$("#no").click(function () {
+				jp.prompt("审核意见", function (message) {
+					jp.post("${ctx}/act/task/auditDrawings", {
+								"taskId":"${uploadImages.act.taskId}",
+								"taskName":"${uploadImages.act.taskName}",
+								"taskDefKey":"${uploadImages.act.taskDefKey}",
+								"procInsId":"${uploadImages.act.procInsId}",
+								"procDefId":"${uploadImages.act.procDefId}",
+								"flag":"yes",
+								"comment":window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				});
 			});
 		});
 	</script>
@@ -70,6 +70,7 @@
 						<div class="col-sm-6">
 							<div class="form-group text-center">
 								<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
+								<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="驳回" />&nbsp;
 							</div>
 						</div>
 					</div>

src/main/webapp/webpage/modules/sg/picking/activiti/applicationAudit.jsp

@@ -0,0 +1,201 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>领料项目经理审核</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			$("#agree").click(function () {
+				jp.prompt("没有问题，完成交底", function (message) {
+					jp.post("${ctx}/act/task/applicationAudit",
+							{
+								"taskId":"${pickApplication.act.taskId}",
+								"taskName":"${pickApplication.act.taskName}",
+								"taskDefKey":"${pickApplication.act.taskDefKey}",
+								"procInsId":"${pickApplication.act.procInsId}",
+								"procDefId":"${pickApplication.act.procDefId}",
+								"flag":"yes",
+								"comment":window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				})
+			});
+			$("#no").click(function () {
+				jp.prompt("没有问题，完成交底", function (message) {
+					jp.post("${ctx}/act/task/applicationAudit",
+					{
+						"taskId":"${pickApplication.act.taskId}",
+						"taskName":"${pickApplication.act.taskName}",
+						"taskDefKey":"${pickApplication.act.taskDefKey}",
+						"procInsId":"${pickApplication.act.procInsId}",
+						"procDefId":"${pickApplication.act.procDefId}",
+						"flag":"no",
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}
+					})
+				})
+			});
+		})
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<form:form id="inputForm" modelAttribute="project" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
+						<table class="table table-bordered">
+							<tbody>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.projectNumber)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.requireName)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.powerLine)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.powerScope)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.projectType)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.preliminaryJudgment)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.flagCivilEngineering)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.steelTubePole)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.flagApprovalPlanning)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.equCreateType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.equCreateSize)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.flagNewEquName)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.includeBdzNews)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.flagNoElectrical)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.drawingsWork)}
+							</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.flagAutomation)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.twoAndThreeRemote)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>通信方式：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.phoneStyle)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.stayOpenArea)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.ringNetworkCabinet)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.stationDtu)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(project.status)}
+								</td>
+							</tr>
+							</tbody>
+						</table>
+					</form:form>
+						<div class="row">
+							<div class="col-sm-3"></div>
+							<div class="col-sm-6">
+								<div class="form-group text-center">
+									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="确认判断结果" />&nbsp;
+									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />
+								</div>
+							</div>
+						</div>
+
+					<c:if test="${not empty pickApplication.id}">
+						<act:flowChart procInsId="${pickApplication.act.procInsId}"/>
+						<act:histoicFlow procInsId="${pickApplication.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/picking/activiti/constructionLeaderForm.jsp

@@ -20,6 +20,7 @@
 					</h3>
 				</div>
 				<div class="panel-body">
+
 					<form:form id="inputForm" modelAttribute="showList" action="${ctx}/picking/activiti/save" method="post" class="form-horizontal">
 						<form:hidden path="id"/>
 						<form:hidden path="act.taskId"/>
@@ -33,6 +34,7 @@
 						</div>
 						<table class="table table-bordered">
 							<tbody>
+							<h3>项目：${projectNumber.requireName}&nbsp;发起第${projectNumber.theNumber}次开具领料清单</h3>
 							<tr>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目名称：</label></td>
 								<td class="width-35">

src/main/webapp/webpage/modules/sg/picking/activiti/pickingApplication.jsp

@@ -20,7 +20,7 @@
 					</h3>
 				</div>
 				<div class="panel-body">
-					<form:form id="inputForm" modelAttribute="showList" action="${ctx}/picking/activiti/save" method="post" class="form-horizontal">
+					<form:form id="inputForm" modelAttribute="pickApplication" action="${ctx}/picking/activiti/pickSave" method="post" class="form-horizontal">
 						<form:hidden path="id"/>
 						<form:hidden path="act.taskId"/>
 						<form:hidden path="act.taskName"/>
@@ -36,17 +36,9 @@
 							<tr>
 								<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/dataPicking" id="project" name="projectId" value="${showList.projectName}" labelName="project.requireName" labelValue="${showList.projectName}"
+									<sys:itemselect url="${ctx}/sg/managementcenter/project/pickingApplication" id="project" name="projectId" value="${showList.projectName}" labelName="project.requireName" labelValue="${showList.projectName}"
 													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projecId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}" searchKeys="requireName"  isMultiSelected="false"></sys:itemselect>
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>选择模块版本：</label></td>
-								<td class="width-35">
-									<form:select  cssClass="form-control" path="sVersion">
-										<c:forEach items="${showList.version}" var="list">
-											<option value="${list}">${list}</option>
-										</c:forEach>
-									</form:select>
-								</td>
 							</tr>
 							<tr>
 							</tr>
@@ -64,9 +56,9 @@
 								</div>
 						</div>
 					</form:form>
-					<c:if test="${not empty showList.id}">
-						<act:flowChart procInsId="${showList.act.procInsId}"/>
-						<act:histoicFlow procInsId="${showList.act.procInsId}" />
+					<c:if test="${not empty pickApplication.id}">
+						<act:flowChart procInsId="${pickApplication.act.procInsId}"/>
+						<act:histoicFlow procInsId="${pickApplication.act.procInsId}" />
 					</c:if>
 				</div>
 			</div>