配网物资专职，可选择甲供物资库中信息添加数量

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/web/MaterialProvidedController.java

@@ -71,6 +71,16 @@ public class MaterialProvidedController extends BaseController {
 	}
 
 	/**
+	 * 控件列表数据
+	 */
+	@ResponseBody
+	@RequestMapping(value = "searchData")
+	public Map<String, Object> searchData(MaterialProvided materialProvided, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<MaterialProvided> page = materialProvidedService.findPage(new Page<MaterialProvided>(request, response), materialProvided);
+		return getBootstrapData(page);
+	}
+
+	/**
 	 * 查看，增加，编辑表单页面
 	 */
 	@RequiresPermissions(value={"managementcenter:materialProvided:view","managementcenter:materialProvided:add","managementcenter:materialProvided:edit"},logical=Logical.OR)

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

@@ -36,5 +36,8 @@ public interface PickIngMapper extends BaseMapper<PickIng> {
 
     void updateSelectVersion(String version);
 
+    /**
+     * 插入领料清单
+     * */
     void processList(@Param("showList")List<ShowList> showList);
 }

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

@@ -27,18 +27,38 @@ public interface ShowListMapper extends BaseMapper<ShowList> {
      */
     void newSave(PickApplication pickApplication);
 
+    /**
+     * 更改项目提前领料标识
+     * */
     void projectUpdate(PickApplication pickApplication);
 
+    /**
+     * 通过id获取申请的信息id
+     * */
     String selectProjectId(String id);
 
+    /**
+     * 根据流程定义号获得领料清单
+     * */
     List<ShowList> findNewList(ShowList showList);
 
+    /**
+     * 根据id查询领料清单中的需要修改的那条信息
+     * */
     ShowList findOneList(ShowList showList);
 
-
+    /**
+     * 通过流程定义号查询，这个流程使用的模块版本号
+     * */
     String itemQuery(String procInsId);
 
+    /**
+     * 更新领料清单
+     * */
     void updateAmount(ShowList showList);
 
+    /**
+     * 根据id删除领料清单
+     * */
     void deleteData(String id);
 }

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

@@ -195,4 +195,43 @@
 	<delete id="deleteData">
 		delete from md_process_list where id=#{id};
 	</delete>
+	<insert id="insertProcess">
+		INSERT INTO md_process_list(
+			ID,
+			CREATE_BY,
+			CREATE_DATE,
+			UPDATE_BY,
+			UPDATE_DATE,
+			DEL_FLAG,
+			REMARKS,
+			PROCINSID,
+			MATERIALCODE,
+			EXTENSIONDESCRIPTION,
+			MATERIALDESCRIPTION,
+			MDUNITS,
+			MDTOTALAMOUNT,
+			MDSINGLEWEIGHT,
+			MDTOTALWEIGHT,
+			MDTHEPARTY,
+			MDTEXT
+		)VALUES(
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag},
+			#{procinsid},
+			#{materialcode},
+			#{extensiondescription},
+			#{materialdescription},
+			#{mdunits},
+			#{mdtotalamount},
+			#{mdsingleweight},
+			#{mdtotalweight},
+			#{mdtheparty},
+			#{mdtex}T
+		);
+	</insert>
 </mapper>

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

@@ -39,6 +39,9 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 		return page;
 	}
 
+	/**
+	 * 根据id查询领料清单中的需要修改的那条信息
+	 * */
 	public ShowList findOneList(ShowList showList){
 		return showListMapper.findOneList(showList);
 	}

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

@@ -10,6 +10,8 @@ import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
+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;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sg.picking.activiti.entity.*;
@@ -47,6 +49,8 @@ public class PickIngController extends BaseController {
     private ConstructionService constructionService;
     @Autowired
     private ProjectService projectService;
+    @Autowired
+    private MaterialProvidedService materialProvidedService;
 
     /**
      * 填写项目表
@@ -109,6 +113,15 @@ public class PickIngController extends BaseController {
         return "modules/sg/picking/activiti/leaderExamine";
     }
 
+    /**
+     * 新增物料
+     */
+    @RequestMapping(value = "netExamineUpload")
+    public String netExamineUpload(ShowList showList, Model model) {
+        model.addAttribute("showList", showList);
+        return "modules/sg/picking/activiti/netExamineUpload";
+    }
+
 //    constructionLeaderForm.jsp
 
     /**
@@ -268,7 +281,7 @@ public class PickIngController extends BaseController {
     }
 
     /**
-     * 领料流程发起
+     * 修改领料清单总量，自动计算总重
      */
     @ResponseBody
     @RequestMapping(value = "mdTotalAmount")
@@ -277,6 +290,7 @@ public class PickIngController extends BaseController {
         //获取新的数量
         Double aDouble = Double.valueOf(mdTotalAmount);
         showList.setMdTotalAmount(aDouble);
+        //根据id查询领料清单中的需要修改的那条信息
         ShowList oneList = showListService.findOneList(showList);
         //获取单重
         Double mdSingleWeight = oneList.getMdSingleWeight();
@@ -303,5 +317,52 @@ public class PickIngController extends BaseController {
         j.setMsg("删除成功！");
         return j;
     }
+
+    /**
+     * 添加甲供物资信息到流程中
+     */
+    @ResponseBody
+    @RequestMapping(value = "netSave")
+    public AjaxJson netSave(String project,Double mdTotalAmount,String procInsId) {
+        AjaxJson j = new AjaxJson();
+        try {
+            ShowList showList = new ShowList();
+            //根据id查询甲供物资的信息
+            MaterialProvided materialProvided = materialProvidedService.get(project);
+            //设置id
+            showList.preInsert();
+            //物料编码
+            showList.setMaterialCode(materialProvided.getMaterialCode());
+            //流程实例编号
+            showList.setProcInsId(procInsId);
+            //物料描述
+            showList.setMaterialDescription(materialProvided.getMaterialDescription());
+            //扩展描述
+            showList.setExtensionDescription(materialProvided.getExtendedDescription());
+            //单位
+            showList.setMdUnits(materialProvided.getMeasuringUnit());
+            //总量
+            showList.setMdTotalAmount(mdTotalAmount);
+            //单重
+            showList.setMdSingleWeight(0.0);
+            //总重
+            showList.setMdTotalWeight(0.0);
+            //甲乙供
+            showList.setMdTheParty("");
+            //备注
+            showList.setMdText("");
+
+            List<ShowList> insertList = new ArrayList<>();
+            insertList.add(showList);
+            //将信息和数量存入对应表
+            pickIngService.processList(insertList);
+            j.setMsg("添加成功！");
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("添加失败");
+            e.printStackTrace();
+        }
+        return j;
+    }
 }
 

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

@@ -335,11 +335,10 @@ $(document).ready(function() {
 			})
 		})
 	}
-	function edit(id){//没有权限时，不显示确定按钮
-		if(id == undefined){
-			id = getIdSelections();
-		}
-		jp.openSaveDialog('编辑图片管理', "${ctx}/managementcenter/upload/imagesForm?id=" + id, '800px', '500px');
+
+	function add(){
+		var procInsId = $("#procInsId").val();
+		jp.openSaveDialog('新增物料', "${ctx}/picking/activiti/netExamineUpload?procInsId="+procInsId,'800px', '500px');
 	}
 
 </script>

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

@@ -27,6 +27,9 @@
 			<div id="div2" style="display: block">
 				<!-- 工具栏 -->
 				<div style="margin-top: 10px;">
+					<button id="add" class="btn btn-primary" onclick="add()">
+						<i class="glyphicon glyphicon-plus"></i> 新建
+					</button>
 					<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
 						<i class="glyphicon glyphicon-remove"></i> 删除
 					</button>

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

@@ -7,20 +7,59 @@
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="netExamine.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() {
+			var project = $("#projectId").val();
+			var mdTotalAmount = $("#mdTotalAmount").val();
+			var procInsId = $("#procInsId").val();
+			if (null==project||""==project){
+				jp.error("请选择需要添加的项目！");
+			}else if(null==mdTotalAmount||""==mdTotalAmount||mdTotalAmount<=0) {
+				jp.error("请填入正确的数值");
+			}else {
+/*				console.log(project);
+				console.log(mdTotalAmount);
+				console.log(procInsId);*/
+				jp.loading();
+				jp.post("${ctx}/picking/activiti/netSave",{"project":project,"mdTotalAmount":mdTotalAmount,"procInsId":procInsId},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 class="bg-white">
 	<form:form id="inputForm" modelAttribute="showList" class="form-horizontal">
 		<form:hidden path="id"/>
-		<input id="procInsId" type="hidden" value="${showList.procInsId}">
-		<input id="xmImgId" type="hidden" value="${showList.id}">
+		<input type="hidden" id="procInsId" name="procInsId" value="${showList.act.procInsId}"/>
 		<table class="table table-bordered">
 			<tbody>
 			<tr>
-				<td class="width-15 active">
-
+				<td class="width-15 active"><label class="pull-right" style="float: left">项目信息：</label></td>
+				<td class="width-35">
+					<sys:itemselect url="${ctx}/sg/managementcenter/marterialProvided/searchData" id="project" name="projectId" value="${materialProvided.id}" labelName="materialProvided.materialDescription" labelValue="${materialProvided.materialDescription}"
+									title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('物料编码|物料描述|扩展编码|扩展编码描述|计量单位|参考概算价格|版本号')}" fieldKeys="materialCode|materialDescription|extendedCode|extendedDescription|measuringUnit|referencePrice|version" searchLabels="${fns:urlEncode('物料编码')}" searchKeys="materialCode"  isMultiSelected="false"></sys:itemselect>
 				</td>
+			</tr>
+			<tr>
+				<td class="width-15 active"><label class="pull-right" style="float: left">添加数量：</label></td>
 				<td class="width-35">
-
+					<input type="number" id="mdTotalAmount" class="form-control">
 				</td>
 			</tr>
 			</tbody>