施工交底，项目经理组织交底，可以对当前项目修改施工交底，默认是没有问题，点击审核完成流程扭转

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

@@ -1462,6 +1462,113 @@ public class ActTaskService extends BaseService {
 
 
 	/**
+	 * 项目经理人工审核问题
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void divideForm(Act act) {
+		/*
+		 * pass1 = 设计变更
+		 * pass2 = 项目关闭
+		 * pass3 = 政策处理（城区道路）
+		 * pass4 = 驳回施工单位
+		 * pass5 = 政策处理（农场/民事）
+		 * */
+		boolean pass1 = false;
+		boolean pass2 = false;
+		boolean pass3 = false;
+		boolean pass4 = false;
+		boolean pass5 = false;
+		boolean pass6 = false;
+		boolean pass7 = false;//无问题
+		Map<String, Object> vars = Maps.newHashMap();
+		//pass对应进入问题模块，pass4对应没有问题完成施工交底
+		vars.put("pass", false);
+		vars.put("pass4", false);
+		vars.put("pass1", false);
+		vars.put("pass2", false);
+		vars.put("pass3", false);
+		vars.put("pass5", false);
+		vars.put("pass6",false);
+		vars.put("self", true);
+		vars.put("problem", false);
+		String flag = act.getFlag();
+		String[] split = flag.split(";");
+		for (String a : split) {
+			if ("pass1".equals(a)) {
+				pass1 = true;
+			} else if ("pass2".equals(a)) {
+				pass2 = true;
+			} else if ("pass3".equals(a)) {
+				pass3 = true;
+			} else if ("pass4".equals(a)) {
+				pass4 = true;
+			} else if ("pass5".equals(a)) {
+				pass5 = true;
+			} else if ("pass6".equals(a)) {
+				pass5 = true;
+			}else if ("pass7".equals(a)){
+				pass6 = true;
+			}else if ("pass8".equals(a)){
+				pass7 = true;
+			}
+		}
+		if (pass6){
+			act.setComment("[人工判断]" + act.getComment());
+			act.preUpdate();
+			// 对不同环节的业务逻辑进行操作
+			String taskDefKey = act.getTaskDefKey();
+			// 提交流程任务
+			Project user = MyActiviUtils.findUser(act.getProcInsId());
+			vars.put("processer", user.getProjectManageRole());
+			vars.put("pass6", true);
+			complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+		}else {
+			if (pass4) {
+				act.setComment("[完成施工交底]" + act.getComment());
+				act.preUpdate();
+				// 对不同环节的业务逻辑进行操作
+				String taskDefKey = act.getTaskDefKey();
+				// 提交流程任务
+				String processer = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:施工单位组织交底");
+				vars.put("processer", processer);
+				vars.put("pass4", true);
+				complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+			} else {
+				if (pass1) {
+					vars.put("pass1", true);
+					Project user = MyActiviUtils.findUser(act.getProcInsId());
+					vars.put("design", user.getRunUnitRole());
+				}
+				if (pass2) {
+					vars.put("pass2", true);
+					Project user = MyActiviUtils.findUser(act.getProcInsId());
+					vars.put("itemClose", user.getDistributionEngineering());
+				}
+				if (pass3) {
+					vars.put("pass3", true);
+					Project user = MyActiviUtils.findUser(act.getProcInsId());
+					vars.put("coveredPerson", user.getConstructionUnitRole());
+				}
+				if (pass5) {
+					vars.put("pass5", true);
+					Project user = MyActiviUtils.findUser(act.getProcInsId());
+					vars.put("policy", user.getDistributionPolicy());
+				}
+				if (pass7){
+					vars.put("pass", true);
+					act.setComment("[存在问题]" + act.getComment());
+				}
+				act.preUpdate();
+				// 对不同环节的业务逻辑进行操作
+				String taskDefKey = act.getTaskDefKey();
+				// 提交流程任务
+				complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+			}
+		}
+	}
+
+	/**
 	 * 配网运行人员设计变更页面
 	 * @param act
 	 */

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

@@ -482,6 +482,25 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 
+	/**
+	 * 项目经理组织交底修改页面
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "divideForm")
+	public AjaxJson divideForm(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.divideForm(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
 
 	/**
 	 * 是否可以政策处理（农场/民事）

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

@@ -48,4 +48,7 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
     List<String> insIdByName(String projectName);
 
     List<String> insIdByName2(String projectName);
+
+
+    void insertDisclose(Construction construction);
 }

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

@@ -286,4 +286,72 @@
 	<select id="insIdByName2" resultType="java.lang.String">
 		select proc_ins_id from md_acquisition_process where project_id  in(select id from xm_project_details where require_name like concat('%',#{projectName},'%'))
 	</select>
+	<insert id="insertDisclose">
+		replace into xm_disclose_conclusion
+		(
+		id,
+		create_by,
+		create_date,
+		update_by,
+		update_date,
+		remarks,
+		del_flag,
+		proc_ins_id,
+		projectId,
+		channel,
+		capacity,
+		sceneSize,
+		capacitySize,
+		hiddenDanger,
+		influenceConstruction,
+		projectRepetition,
+		implemented,
+		transformer,
+		lineName,
+		quantities,
+		rodNumber,
+		administrationType,
+		precondition,
+		placementMode,
+		productionDate,
+		IntegrateModule,
+		needReplace,
+		overallTransformation,
+		explanationOfNecessity,
+		inconsistentDescription,
+		policyHandlingInstructions
+		) values (
+		#{id},
+		#{createBy.id},
+		#{createDate},
+		#{updateBy.id},
+		#{updateDate},
+		#{remarks},
+		#{delFlag},
+		#{procInsId},
+		#{projectId},
+		#{disclose.channel},
+		#{disclose.capacity},
+		#{disclose.sceneSize},
+		#{disclose.capacitySize},
+		#{disclose.hiddenDanger},
+		#{disclose.influenceConstruction},
+		#{disclose.projectRepetition},
+		#{disclose.implemented},
+		#{disclose.transformer},
+		#{disclose.lineName},
+		#{disclose.quantities},
+		#{disclose.rodNumber},
+		#{disclose.administrationType},
+		#{disclose.precondition},
+		#{disclose.placementMode},
+		#{disclose.productionDate},
+		#{disclose.IntegrateModule},
+		#{disclose.needReplace},
+		#{disclose.overallTransformation},
+		#{disclose.explanationOfNecessity},
+		#{disclose.inconsistentDescription},
+		#{disclose.policyHandlingInstructions}
+		);
+	</insert>
 </mapper>

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

@@ -109,4 +109,12 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		return constructionMapper.findNameByInsID(procInsId);
 	}
 
+	/**
+	 * 新增施工交底
+	 * */
+	@Transactional(readOnly = false)
+	public void insertDisclose(Construction construction){
+		construction.preInsert();
+		constructionMapper.insertDisclose(construction);
+	}
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyActiviUtils.java

@@ -199,6 +199,16 @@ public class MyActiviUtils {
         return j;
     }
 
+    public static  List<String> findMdActivity(String activityName) {
+        List<String> j = new ArrayList<>();
+        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+        List<Task> list = processEngine.getTaskService().createTaskQuery().taskName(activityName).taskAssignee(UserUtils.getUser().getLoginName()).list();
+        for (Task t : list) {
+            j.add(t.getProcessInstanceId());
+        }
+        return j;
+    }
+
     /**
      * 根据流程实例定义号节点名称登陆人查询节点
      */

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyImportUtils.java

@@ -125,7 +125,7 @@ public class MyImportUtils {
                     flag = true;
                     tips += "政处类型填写有误";
                 }else {
-                    if (("1.农村政处".equals(administrationType)&&"2.民事政处/行政政处（公路/水利）".equals(administrationType)&&"3.行政政处（城区道路）".equals(administrationType))) {
+                    if (("1.农村政处".equals(administrationType)||"2.民事政处/行政政处（公路/水利）".equals(administrationType)||"3.行政政处（城区道路）".equals(administrationType))) {
                         if ("".equals(policyHandlingInstructions) || policyHandlingInstructions == null) {
                             flag = true;
                             tips += "政策处理说明不能为空";

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -5,6 +5,7 @@ package com.jeeplus.modules.sg.managementcenter.activiti.web;
 
 import java.util.*;
 
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
 import com.jeeplus.modules.sys.entity.User;
 
@@ -258,6 +259,13 @@ public class ConstructionController extends BaseController {
         return "modules/sg/managementcenter/activiti/documentsForm";
     }
 
+    @RequestMapping(value = "editCon")
+    public String editCon(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/editCon";
+    }
+
+
     /**
      * 配网运行人员判定设计变更
      * 人工审核页面
@@ -394,6 +402,85 @@ public class ConstructionController extends BaseController {
         return j;
     }
 
-
-
+    @ResponseBody
+    @RequestMapping(value = "editConSave")
+    public AjaxJson editConSave(Construction construction, Model model) throws Exception {
+        AjaxJson j = new AjaxJson();
+        boolean flag = true;
+        //获取施工交底的填写信息
+        Disclose disclose = construction.getDisclose();
+        //设备基础是否可以扩容
+        String capacity = disclose.getCapacity();
+        //现场设备尺寸
+        String sceneSize = disclose.getSceneSize();
+        //最多可扩容尺寸
+        String capacitySize = disclose.getCapacitySize();
+        //方案安全隐患
+        String hiddenDanger = disclose.getHiddenDanger();
+        //是否存在低压或通信线等影响施工
+        String influenceConstruction = disclose.getInfluenceConstruction();
+        //立项重复
+        String projectRepetition = disclose.getProjectRepetition();
+        //是否已实施
+        String implemented = disclose.getImplemented();
+        //变压器无负荷
+        String transformer = disclose.getTransformer();
+        //项目实施必要性说明
+        String explanationOfNecessity = disclose.getExplanationOfNecessity();
+        //线路名称一致性
+        String lineName = disclose.getLineName();
+        //工程量是否一致
+        String quantities = disclose.getQuantities();
+        //设备、开关、杆号一致性
+        String rodNumber = disclose.getRodNumber();
+        //图纸现场不一致说明
+        String inconsistentDescription = disclose.getInconsistentDescription();
+        //政处类型
+        String administrationType = disclose.getAdministrationType();
+        //前置条件
+        String precondition = disclose.getPrecondition();
+        //政策处理说明
+        String policyHandlingInstructions = disclose.getPolicyHandlingInstructions();
+        //DTU安放方式核查
+        String placementMode = disclose.getPlacementMode();
+        //核查环网柜生产日期
+        String productionDate = disclose.getProductionDate();
+        if ("是".equals(capacity)) {
+            if ("".equals(sceneSize) || "".equals(capacitySize)) {
+                j.setMsg("现场设备尺寸、最多可扩容尺寸需填写");
+                j.setSuccess(false);
+                flag = false;
+            }
+        } else if ("有".equals(hiddenDanger) || "是".equals(influenceConstruction)|| "是".equals(projectRepetition)|| "是".equals(implemented)|| "无".equals(transformer)) {
+            if ("".equals(explanationOfNecessity) || explanationOfNecessity == null) {
+                j.setMsg("必要性问题说明不能为空");
+                j.setSuccess(false);
+                flag = false;
+            }
+        }else if ("不一致".equals(lineName)||"否".equals(quantities)||"不一致".equals(rodNumber)) {
+            if ("".equals(inconsistentDescription) || inconsistentDescription == null) {
+                j.setMsg("图纸现场不一致说明不能为空");
+                j.setSuccess(false);
+                flag = false;
+            }
+        }else if (("1.农村政处".equals(administrationType)||"2.民事政处/行政政处（公路/水利）".equals(administrationType)||"3.行政政处（城区道路）".equals(administrationType))) {
+            if ("".equals(policyHandlingInstructions) || policyHandlingInstructions == null) {
+                j.setMsg("政策处理说明不能为空");
+                j.setSuccess(false);
+                flag = false;
+            }
+        } else if ("户内".equals(placementMode)||"户外".equals(placementMode)) {
+            if ("".equals(productionDate)) {
+                j.setMsg("核查环网柜生产日期不能为空");
+                j.setSuccess(false);
+                flag = false;
+            }
+        }
+        if (flag) {
+            constructionService.insertDisclose(construction);
+            j.setMsg("插入成功");
+            j.setSuccess(true);
+        }
+        return j;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/DivideController.java

@@ -89,6 +89,7 @@ public class DivideController extends BaseController {
 //	}*/
 
 
+
     /**
      * 查看，增加，编辑请假申请表单页面
      */
@@ -100,6 +101,12 @@ public class DivideController extends BaseController {
             return "modules/sg/managementcenter/activiti/divideAudit";
         } else {//add
             //项目经理组织交底
+            Disclose disclose = construction.getDisclose();
+            if (disclose == null) {
+                model.addAttribute("pass_construction7","0");
+            } else {
+                MyImportUtils.getTheEcho(construction,model);
+            }
             return "modules/sg/managementcenter/activiti/divideForm";
         }
 //		return "modules/sg/managementcenter/activiti/constructionForm";
@@ -151,7 +158,7 @@ public class DivideController extends BaseController {
 
 
     /**
-     * 旧）导入交底结论，正在使用
+     * 旧）导入交底结论，未使用
      * */
     @ResponseBody
     @RequestMapping(value = "importConclusion")
@@ -235,7 +242,7 @@ public class DivideController extends BaseController {
 
 
     /**
-     * 新导入交底结论（未使用）
+     * 新导入交底结论（使用中）
      */
 //    @RequiresPermissions("modules:sg:information:information:import")
     @ResponseBody
@@ -320,6 +327,7 @@ public class DivideController extends BaseController {
                     Map<String, Object> vars = Maps.newHashMap();
                     String precondition = d.getPrecondition();
                     Project user = MyActiviUtils.findUser(d.getProcInsId());
+                    vars.put("self", false);
                     if (precondition != null && !"".equals(precondition)) {
                         vars.put("problem",false);
                         vars.put("pass4", true);

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

@@ -50,6 +50,10 @@ public class ShowList extends ActEntity<ShowList> implements Comparable<ShowList
     private String projectId;
     //选择的项目及数量
     private String selectNumber;
+    //可用库存数量
+    private Double availableStockQuantity;
+    //在当前节点的数量
+    private Double nowNumber;
 
     public String getMaterialCode() {
         return materialCode;
@@ -228,6 +232,22 @@ public class ShowList extends ActEntity<ShowList> implements Comparable<ShowList
         this.mdName = mdName;
     }
 
+    public Double getAvailableStockQuantity() {
+        return availableStockQuantity;
+    }
+
+    public void setAvailableStockQuantity(Double availableStockQuantity) {
+        this.availableStockQuantity = availableStockQuantity;
+    }
+
+    public Double getNowNumber() {
+        return nowNumber;
+    }
+
+    public void setNowNumber(Double nowNumber) {
+        this.nowNumber = nowNumber;
+    }
+
     @Override
     public int compareTo(ShowList o) {
         String materialCode = this.getMaterialCode();

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

@@ -5,9 +5,12 @@ 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.managementcenter.materialInventory.entity.MaterialInventory;
 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;
+import org.activiti.engine.task.Task;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -61,4 +64,14 @@ public interface ShowListMapper extends BaseMapper<ShowList> {
      * 根据id删除领料清单
      * */
     void deleteData(String id);
+
+    /**
+     * 查询流程中物料的可用库存数量
+     * */
+    List<MaterialInventory> inventoryQuery(List<ShowList> showLists);
+
+    /**
+     *查询在所有在《领料:配网物资专职审核领料单》节点的代码的物料清单
+     */
+    List<ShowList> processListQuery(List<String> list);
 }

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

@@ -161,4 +161,6 @@
 		 )
 		</foreach>
 	</insert>
+
+
 </mapper>

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

@@ -195,7 +195,8 @@
 	<delete id="deleteData">
 		delete from md_process_list where id=#{id};
 	</delete>
-	<insert id="insertProcess">
+
+	<!--<insert id="insertProcess">
 		INSERT INTO md_process_list(
 			ID,
 			CREATE_BY,
@@ -233,5 +234,25 @@
 			#{mdtheparty},
 			#{mdtex}T
 		);
-	</insert>
+	</insert>-->
+
+	<select id="inventoryQuery" resultType="com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory">
+		select materialCode,availableStockQuantity,materialDetail from xm_material_inventory
+		where materialCode in
+		(
+		<foreach collection="list" item="item" separator=",">
+			#{item.materialCode}
+		</foreach>
+		)
+	</select>
+
+	<select id="processListQuery" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
+		select materialCode,mdTotalAmount,extensionDescription,materialDescription from md_process_list
+		where procInsId in
+		(
+		<foreach collection="list" item="item" separator=",">
+			#{item}
+		</foreach>
+		)
+	</select>
 </mapper>

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

@@ -5,9 +5,11 @@ package com.jeeplus.modules.sg.picking.activiti.service;
 
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory;
 import com.jeeplus.modules.sg.picking.activiti.entity.*;
 import com.jeeplus.modules.sg.picking.activiti.mapper.PickIngMapper;
 import com.jeeplus.modules.sg.picking.activiti.mapper.ShowListMapper;
+import org.activiti.engine.task.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -96,4 +98,16 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 	public void deleteData(String id){
 		showListMapper.deleteData(id);
 	}
+
+	/**
+	 * 查询流程中物料的可用库存数量
+	 * */
+	public List<MaterialInventory> inventoryQuery(List<ShowList> showLists){
+		return showListMapper.inventoryQuery(showLists);
+	}
+
+	public  List<ShowList> processListQuery(List<String> list){
+		return showListMapper.processListQuery(list);
+	}
+
 }

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

@@ -8,8 +8,10 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.FindTask;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
+import com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory;
 import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided;
 import com.jeeplus.modules.sg.managementcenter.materialProvided.service.MaterialProvidedService;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
@@ -20,6 +22,7 @@ import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
 import com.jeeplus.modules.sys.entity.DictValue;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -30,9 +33,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Controller
 @RequestMapping(value = "${adminPath}/picking/activiti")
@@ -176,8 +177,51 @@ public class PickIngController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "constructionData")
     public Map<String, Object> constructionData(ShowList showList, String procInsId, HttpServletRequest request, HttpServletResponse response, Model model) {
-            Page<ShowList> page = showListService.findNewPage(new Page<ShowList>(request, response), showList);
-            return getBootstrapData(page);
+        Page<ShowList> page = showListService.findNewPage(new Page<ShowList>(request, response), showList);
+        List<ShowList> list = page.getList();
+        //得到物料信息的可用库存数
+        List<MaterialInventory> materialInventoryList = showListService.inventoryQuery(list);
+        //查询在当前节点的所有流程实例编号
+        List<String> activity = MyActiviUtils.findMdActivity("领料:配网物资专职审核领料单");
+        if (activity!=null&&activity.size()>0) {
+        //根据编号查询到所有的物料信息
+        List<ShowList> showLists = showListService.processListQuery(activity);
+        //相同的物料信息相加
+        HashMap<String, ShowList> tempMap = new HashMap<String, ShowList>();
+        for (ShowList show : showLists) {
+            String materialCode = show.getMaterialCode() + "|" + show.getExtensionDescription() + "|" + show.getExtensionDescription();
+            if (tempMap.containsKey(materialCode)) {
+                ShowList needShow = new ShowList();
+                tempMap.get(materialCode).setMdTotalAmount(tempMap.get(materialCode).getMdTotalAmount() + show.getMdTotalAmount());
+            } else {
+                tempMap.put(materialCode, show);
+            }
+        }
+        //合并后的list
+        List<ShowList> newShowList = new ArrayList<>();
+        Iterator<Map.Entry<String, ShowList>> iterator = tempMap.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry<String, ShowList> next = iterator.next();
+            ShowList newShow = next.getValue();
+            newShowList.add(newShow);
+        }
+        //返回定义物料编码的数据
+        for (ShowList show : list) {
+            //可用库存/
+            for (MaterialInventory ava : materialInventoryList) {
+                if (show.getMaterialCode().equals(ava.getMaterialCode()) && show.getMaterialDescription().equals(ava.getMaterialDetail())) {
+                    show.setAvailableStockQuantity(ava.getAvailableStockQuantity());
+                }
+            }
+            //当前节点的使用库存
+            for (ShowList newShow : newShowList) {
+                if (show.getMaterialCode().equals(newShow.getMaterialCode()) && show.getExtensionDescription().equals(newShow.getExtensionDescription()) && show.getMaterialDescription().equals(newShow.getMaterialDescription())) {
+                    show.setNowNumber(newShow.getMdTotalAmount());
+                }
+            }
+        }
+        }
+        return getBootstrapData(page);
     }
 
     /**

src/main/webapp/webpage/modules/sg/managementcenter/activiti/divideForm.js

@@ -88,6 +88,14 @@
                 }
             });
         });
-
+        $("#edit").click(function () {
+            var val = $("#id").val();
+            jp.openSaveDialog('修改交底结论', "${ctx}/managementcenter/activiti/editCon?id="+val, '1000px', '800px');
+        });
     })
+
+    //刷新列表
+    function refresh(){
+        location.reload();
+    }
 </script>

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

@@ -7,6 +7,75 @@
 	<!-- SUMMERNOTE -->
 	<%@include file="/webpage/include/summernote.jsp" %>
 	<%@include file="divideForm.js"%>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			$("#agree").click(function () {
+				var cValue ="";//定义一个数组
+				var flag1 = false;//代表是否选择了设计变更/行政政处/农村民事政处的状态，false为未选择，true为选择
+				var flag2 = false;//代表是否选择了项目关闭的状态，false为未选择，true为选择
+				var flag3 = false;//代表是否选择了政策处理 行政政处（城区道路）
+				var flag5 = false;//代表是否选择了农村政处
+				var flag6 = false;//代表是否选择了民事政处/行政政处（公路/水利）
+				var flag7 = false;//代表是否选择了人工判断
+				var flag8 = false;//代表无问题
+				var nValue = $('input[name="favorite"]:checked');
+				$('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
+					//判断选取的值如果时pass2，flag2为true，代表选择了项目关闭，选取的值不为pass2，flag1为true代表其它类型被选择
+					if ("pass8" == $(this).val()){
+						flag8 = true;
+					}
+					if ("pass7"==$(this).val()){
+						flag7 = true;
+					}
+					if ("pass2" == $(this).val()) {
+						flag2 = true;
+					}else {
+						flag1 = true;
+					}
+					//判断值为pass3，代表选择了政策处理 行政政处（城区道路）
+					if ("pass3"==$(this).val()) {
+						flag3 = true;
+					}
+					//判断值为pass5，代表选择了农村政处
+					if ("pass5"==$(this).val()) {
+						flag5 = true;
+					}
+					//判断值为pass6，民事政处/行政政处（公路/水利）
+					if ("pass6"==$(this).val()) {
+						flag6 = true;
+					}
+					cValue=cValue+";"+($(this).val());//将选中的值添加到数组chk_value中
+				});
+				if (nValue == null || nValue.size() <= 0) {
+					jp.error("请选择问题类型");
+				} else if(flag1==true&&flag2==true){
+					jp.error("项目关闭与其它类型问题不可同时发起");
+				}else if ((flag3==true&&flag5==true)||(flag3==true&&flag6==true)||(flag5==true&&flag6==true)){
+					jp.error("政处类型只能选择一种");
+				}else {
+					jp.prompt(" 审批意见", function (message) {
+						jp.post("${ctx}/act/task/divideForm",
+								{
+									"taskId":"${construction.act.taskId}",
+									"taskName":"${construction.act.taskName}",
+									"taskDefKey":"${construction.act.taskDefKey}",
+									"procInsId":"${construction.act.procInsId}",
+									"procDefId":"${construction.act.procDefId}",
+									"flag":cValue,
+									"projectName":"${fns:unescapeHtml(construction.projectName)}",
+									"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">
@@ -22,145 +91,41 @@
 					<button id="importConclusion" class="btn btn-info">
 						<i class="fa fa-folder-open-o"></i> 导入交地结论
 					</button>
+					<button id="edit" class="btn btn-danger">
+						<i class="fa fa-folder-open-o"></i> 修改交底结论
+					</button>
 					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
 					<form:hidden path="id"/>
-
 						<input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
 						<input id="projectName" type="hidden" value="${fns:unescapeHtml(construction.projectName)}">
 						<input type="hidden" value="${fns:unescapeHtml(construction.id)}">
-
 						<table class="table table-bordered">
 							<tbody>
-<%--							<tr>
-								<td class="width-15 active"><label class="pull-right"> 申请人：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.userName)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 审核人：</label></td>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">问题类型：</label></td>
 								<td class="width-35">
-									<sys:userselect roleName="项目经理;施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
-													cssClass="form-control required"/>
+									<input type="checkbox" name="favorite" value="pass8"  <c:if test="${pass_construction7=='0'}">checked="checked"</c:if> onclick="return false"> 无问题 &nbsp;
+									<input type="checkbox" name="favorite" value="pass1" <c:if test="${pass_construction2=='0'}">checked="checked"</c:if> onclick="return false"> 设计变更 &nbsp;
+									<input type="checkbox" name="favorite" value="pass2" <c:if test="${pass_construction1=='0'}">checked="checked"</c:if> onclick="return false"> 项目关闭 &nbsp;
+									<input type="checkbox" name="favorite" value="pass3"  <c:if test="${pass_construction5=='0'}">checked="checked"</c:if> onclick="return false"> 行政政处（城区道路）
+									<input type="checkbox" name="favorite" value="pass5"  <c:if test="${pass_construction3=='0'}">checked="checked"</c:if> onclick="return false"> 农村政处
+									<input type="checkbox" name="favorite" value="pass6"  <c:if test="${pass_construction4=='0'}">checked="checked"</c:if> onclick="return false"> 民事政处/行政政处（公路/水利）
+									<input type="checkbox" name="favorite" value="pass7"  <c:if test="${pass_construction6=='0'}">checked="checked"</c:if> onclick="return false"> 人工判断
 								</td>
-							</tr>--%>
-							<tr>
 								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.projectId)}
 								</td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.projectName)}
 								</td>
-							</tr>
-							<tr>
 								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
 								<td class="width-35">
 									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right">备注说明：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.examineDate)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerLine)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.blackoutArea)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.projectType)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 政处初步判断：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.preliminaryJudgment)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.civilEngineering)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 钢管杆基础类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.baseType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.planApproval)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 设备改造类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationEquipment)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 是否含新设备命名：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.newNamed)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.putInto)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 是否含非涉电电气施工：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.electricalConstruction)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.theAssignment)}
-							</td>
-								<td class="width-15 active"><label class="pull-right"> 是否含自动化：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.automation)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.remote)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 通信方式：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.communicationMode)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.inSitu)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 环网柜DTU户外或户内：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.networkCabinet)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.station)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 是否为停电打包项目：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerFailure)}
-								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
@@ -169,11 +134,14 @@
 								</td>
 								<td class="width-15 active"><label class="pull-right"> 设备基础是否可以扩容：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='capacity'  name="capacity" class="form-control required"  value="${construction.disclose.capacity}"/>
-										<%--<select id="capacity"  maxlength="100"  class=" form-control">
-										<option value="是">是</option>
-										<option value="否">否</option>
-									</select>--%>
+									<c:choose>
+										<c:when test="${construction.disclose.channel}">
+											<input type='text' readonly="readonly" id='capacity'  name="capacity" class="form-control required"  value="${construction.disclose.capacity}"/>
+										</c:when>
+										<c:otherwise>
+											<input type='text' readonly="readonly" id='capacity'  name="capacity" class="form-control required"  value="否"/>
+										</c:otherwise>
+									</c:choose>
 								</td>
 							</tr>
 							<tr>
@@ -189,27 +157,62 @@
 							<tr>
 								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='hiddenDanger'  name="hiddenDanger" class="form-control required"  value="${construction.disclose.hiddenDanger}"/>
+									<c:choose>
+										<c:when test="${construction.disclose.hiddenDanger}">
+											<input type='text' readonly="readonly" id='hiddenDanger'  name="hiddenDanger" class="form-control required"  value="${construction.disclose.hiddenDanger}"/>
+										</c:when>
+										<c:otherwise>
+											<input type='text' readonly="readonly" id='hiddenDanger'  name="hiddenDanger" class="form-control required"  value="无"/>
+										</c:otherwise>
+									</c:choose>
 								</td>
 								<td class="width-15 active"><label class="pull-right"> 是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='influenceConstruction'  name="influenceConstruction" class="form-control required"  value="${construction.disclose.influenceConstruction}"/>
+									<c:choose>
+										<c:when test="${construction.disclose.influenceConstruction}">
+											<input type='text' readonly="readonly" id='influenceConstruction'  name="influenceConstruction" class="form-control required"  value="${construction.disclose.influenceConstruction}"/>
+										</c:when>
+										<c:otherwise>
+											<input type='text' readonly="readonly" id='influenceConstruction'  name="influenceConstruction" class="form-control required"  value="否"/>
+										</c:otherwise>
+									</c:choose>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='projectRepetition'  name="projectRepetition" class="form-control required"  value="${construction.disclose.projectRepetition}"/>
+									<c:choose>
+										<c:when test="${construction.disclose.projectRepetition}">
+											<input type='text' readonly="readonly" id='projectRepetition'  name="projectRepetition" class="form-control required"  value="${construction.disclose.projectRepetition}"/>
+										</c:when>
+										<c:otherwise>
+											<input type='text' readonly="readonly" id='projectRepetition'  name="projectRepetition" class="form-control required"  value="否"/>
+										</c:otherwise>
+									</c:choose>
 								</td>
 								<td class="width-15 active"><label class="pull-right"> 是否已实施：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='implemented'  name="implemented" class="form-control required"  value="${construction.disclose.implemented}"/>
+									<c:choose>
+										<c:when test="${construction.disclose.implemented}">
+											<input type='text' readonly="readonly" id='implemented'  name="implemented" class="form-control required"  value="${construction.disclose.implemented}"/>
+										</c:when>
+										<c:otherwise>
+											<input type='text' readonly="readonly" id='implemented'  name="implemented" class="form-control required"  value="否"/>
+										</c:otherwise>
+									</c:choose>
 								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='transformer'  name="transformer" class="form-control required"  value="${construction.disclose.transformer}"/>
+									<c:choose>
+										<c:when test="${construction.disclose.transformer}">
+											<input type='text' readonly="readonly" id='transformer'  name="transformer" class="form-control required"  value="${construction.disclose.transformer}"/>
+										</c:when>
+										<c:otherwise>
+											<input type='text' readonly="readonly" id='transformer'  name="transformer" class="form-control required"  value="有"/>
+										</c:otherwise>
+									</c:choose>
 								</td>
 								<td class="width-15 active"><label class="pull-right">项目实施必要性说明</label></td>
 								<td class="width-35">
@@ -219,18 +222,40 @@
 							<tr>
 								<td class="width-15 active"><label class="pull-right"> 线路名称一致性：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='lineName'  name="lineName" class="form-control required"  value="${construction.disclose.lineName}"/>
+									<c:choose>
+										<c:when test="${construction.disclose.lineName}">
+											<input type='text' readonly="readonly" id='lineName'  name="lineName" class="form-control required"  value="${construction.disclose.lineName}"/>
+										</c:when>
+										<c:otherwise>
+											<input type='text' readonly="readonly" id='lineName'  name="lineName" class="form-control required"  value="一致"/>
+										</c:otherwise>
+									</c:choose>
+
 								</td>
 								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='quantities'  name="quantities" class="form-control required"  value="${construction.disclose.quantities}"/>
+									<c:choose>
+										<c:when test="${construction.disclose.quantities}">
+											<input type='text' readonly="readonly" id='quantities'  name="quantities" class="form-control required"  value="${construction.disclose.quantities}"/>
+										</c:when>
+										<c:otherwise>
+											<input type='text' readonly="readonly" id='quantities'  name="quantities" class="form-control required"  value="是"/>
+										</c:otherwise>
+									</c:choose>
 								</td>
 
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right"> 设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='rodNumber'  name="rodNumber" class="form-control required"  value="${construction.disclose.rodNumber}"/>
+									<c:choose>
+										<c:when test="${construction.disclose.rodNumber}">
+											<input type='text' readonly="readonly" id='rodNumber'  name="rodNumber" class="form-control required"  value="${construction.disclose.rodNumber}"/>
+										</c:when>
+										<c:otherwise>
+											<input type='text' readonly="readonly" id='rodNumber'  name="rodNumber" class="form-control required"  value="一致"/>
+										</c:otherwise>
+									</c:choose>
 								</td>
 								<td class="width-15 active"><label class="pull-right"> 图纸现场不一致说明：</label></td>
 								<td class="width-35">
@@ -241,14 +266,19 @@
 							<tr>
 								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='administrationType'  name="administrationType" class="form-control required"  value="${construction.disclose.administrationType}"/>
+									<c:choose>
+										<c:when test="${construction.disclose.administrationType}">
+											<input type='text' readonly="readonly" id='administrationType'  name="administrationType" class="form-control required"  value="${construction.disclose.administrationType}"/>
+										</c:when>
+										<c:otherwise>
+											<input type='text' readonly="readonly" id='administrationType'  name="administrationType" class="form-control required"  value="4.无"/>
+										</c:otherwise>
+									</c:choose>
 								</td>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='precondition'  name="precondition" class="form-control required"  value="${construction.disclose.precondition}"/>
 								</td>
-
-
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
@@ -257,9 +287,15 @@
 								</td>
 								<td class="width-15 active"><label class="pull-right"> DTU安放方式核查：</label></td>
 								<td class="width-35">
-									<input type='text' readonly="readonly" id='placementMode'  name="placementMode" class="form-control required"  value="${construction.disclose.placementMode}"/>
+									<c:choose>
+										<c:when test="${construction.disclose.placementMode}">
+											<input type='text' readonly="readonly" id='placementMode'  name="placementMode" class="form-control required"  value="${construction.disclose.placementMode}"/>
+										</c:when>
+										<c:otherwise>
+											<input type='text' readonly="readonly" id='placementMode'  name="placementMode" class="form-control required"  value="无"/>
+										</c:otherwise>
+									</c:choose>
 								</td>
-
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>

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

@@ -0,0 +1,211 @@
+<%@ 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" %>
+    <%@include file="divideForm.js" %>
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $('#beginDate').datetimepicker({
+                format: "YYYY-MM-DD HH:mm:ss"
+            });
+            $('#endDate').datetimepicker({
+                format: "YYYY-MM-DD HH:mm:ss"
+            });
+        });
+        function save() {
+            jp.loading();
+            jp.post("${ctx}/managementcenter/activiti/editConSave",$("#inputForm").serialize(),function (data) {
+                if (data.success) {
+                    jp.getParent().refresh();
+                    var dialogIndex = parent.layer.getFrameIndex(window.name); //获取窗口索引
+                    parent.layer.close(dialogIndex);
+                    jp.success(data.msg);
+                } else {
+                    jp.error(data.msg);
+                }
+            })
+        }
+    </script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-body">
+                    <form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save"
+                               method="post" class="form-horizontal">
+                        <form:hidden path="id"/>
+                        <input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
+                        <table class="table table-bordered">
+                            <tbody>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">施工通道：</label></td>
+                                <td class="width-35">
+                                    <form:input path="disclose.channel" cssClass="form-control"/>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 设备基础是否可以扩容：</label></td>
+                                <td class="width-35">
+                                    <form:select path="disclose.capacity" cssClass="form-control">
+                                        <form:option value="否"/>
+                                        <form:option value="是"/>
+                                    </form:select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
+                                <td class="width-35">
+									<form:input path="disclose.sceneSize" cssClass="form-control"/>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 最多可扩容尺寸：</label></td>
+                                <td class="width-35">
+									<form:input path="disclose.capacitySize" cssClass="form-control"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
+                                <td class="width-35">
+									<form:select path="disclose.hiddenDanger" cssClass="form-control">
+										<form:option value="无"/>
+										<form:option value="有"/>
+									</form:select>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在低压或通信线等影响施工：</label></td>
+                                <td class="width-35">
+									<form:select path="disclose.influenceConstruction" cssClass="form-control">
+										<form:option value="否"/>
+										<form:option value="是"/>
+									</form:select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">立项重复：</label></td>
+                                <td class="width-35">
+									<form:select path="disclose.projectRepetition" cssClass="form-control">
+										<form:option value="否"/>
+										<form:option value="是"/>
+									</form:select>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 是否已实施：</label></td>
+                                <td class="width-35">
+									<form:select path="disclose.implemented" cssClass="form-control">
+										<form:option value="否"/>
+										<form:option value="是"/>
+									</form:select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
+                                <td class="width-35">
+									<form:select path="disclose.transformer" cssClass="form-control">
+										<form:option value="有"/>
+										<form:option value="无"/>
+									</form:select>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">项目实施必要性说明</label></td>
+                                <td class="width-35">
+									<form:input path="disclose.explanationOfNecessity" cssClass="form-control"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 线路名称一致性：</label></td>
+                                <td class="width-35">
+									<form:select path="disclose.lineName" cssClass="form-control">
+										<form:option value="一致"/>
+										<form:option value="不一致"/>
+									</form:select>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
+                                <td class="width-35">
+									<form:select path="disclose.quantities" cssClass="form-control">
+										<form:option value="是"/>
+										<form:option value="否"/>
+									</form:select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 设备、开关、杆号一致性：</label></td>
+                                <td class="width-35">
+									<form:select path="disclose.rodNumber" cssClass="form-control">
+										<form:option value="一致"/>
+										<form:option value="不一致"/>
+									</form:select>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 图纸现场不一致说明：</label></td>
+                                <td class="width-35">
+									<form:input path="disclose.inconsistentDescription" cssClass="form-control"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">政处类型：</label></td>
+                                <td class="width-35">
+									<form:select path="disclose.administrationType" cssClass="form-control">
+										<form:option value="4.无"/>
+										<form:option value="1.农村政处"/>
+										<form:option value="2.民事政处/行政政处（公路/水利）"/>
+										<form:option value="3.行政政处（城区道路）"/>
+									</form:select>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">前置条件：</label></td>
+                                <td class="width-35">
+									<form:input path="disclose.precondition" cssClass="form-control"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+                                <td class="width-35">
+									<form:input path="disclose.policyHandlingInstructions" cssClass="form-control"/>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> DTU安放方式核查：</label></td>
+                                <td class="width-35">
+									<form:select path="disclose.placementMode" cssClass="form-control">
+										<form:option value="无"/>
+										<form:option value="户内"/>
+										<form:option value="户外"/>
+									</form:select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
+                                <td class="width-35">
+									<form:input path="disclose.productionDate" cssClass="form-control"/>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 二次是否是集成模块：</label></td>
+                                <td class="width-35">
+									<form:select path="disclose.integrateModule" cssClass="form-control">
+										<form:option value="否"/>
+										<form:option value="是"/>
+									</form:select>
+                                </td>
+
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
+                                <td class="width-35">
+									<form:select path="disclose.needReplace" cssClass="form-control">
+										<form:option value="否"/>
+										<form:option value="是"/>
+									</form:select>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 设备是否有整体改造的必要：</label></td>
+                                <td class="width-35">
+									<form:select path="disclose.overallTransformation" cssClass="form-control">
+										<form:option value="否"/>
+										<form:option value="是"/>
+									</form:select>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </form:form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/picking/activiti/netExamine.js

@@ -2,7 +2,7 @@
 <script>
 $(document).ready(function() {
 	window.operateEvents = {
-		'blur input': function (e, value, row, index) {
+		'change input': function (e, value, row, index) {
 			var ss = $('#'+row.id).val();
 			jp.confirm('确认要修改？', function () {
 				jp.get("${ctx}/picking/activiti/mdTotalAmount?id="+row.id+"&mdTotalAmount="+ss, function (data) {
@@ -89,6 +89,7 @@ $(document).ready(function() {
 				}, {
 					field: 'extensionDescription',
 					title: '扩展描述',
+					width:'200px'
 				}, {
 					field: 'mdUnits',
 					title: '单位',
@@ -104,6 +105,12 @@ $(document).ready(function() {
 					field: 'mdTotalWeight',
 					title: '总重/吨',
 				}, {
+					field: 'nowNumber',
+					title: '领料单物资数量',
+				}, {
+					field: 'availableStockQuantity',
+					title: '可用库存数量',
+				}, {
 					field: 'mdTheParty',
 					title: '甲乙供',
 				}, {
@@ -221,7 +228,7 @@ $(document).ready(function() {
 
 	function getTime(value, row, index) {
 		return [
-			"<input  id="+row.id+" type='number' name='changeAmount' class='form-control required'  value="+row.mdTotalAmount+">",
+			"<input  id="+row.id+" type='number' name='changeAmount' class='form-control required deal'  value="+row.mdTotalAmount+">",
 		].join('');
 	}
 

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

@@ -7,6 +7,18 @@
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="netExamine.js" %>
+	<style type="text/css">
+		/* 下边两行是去掉input 输入框右边的上下箭头按钮*/
+		.deal::-webkit-inner-spin-button {
+			-webkit-appearance: none !important;
+		}
+		.deal::-webkit-outer-spin-button {
+			-webkit-appearance: none !important;
+		}
+		input{ // 火狐
+			-moz-appearance:textfield;
+		}
+	</style>
 </head>
 <body>
 	<div class="wrapper wrapper-content">