Merge remote-tracking branch 'origin/master'

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

@@ -1166,11 +1166,11 @@ public class ActTaskService extends BaseService {
 		//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);
 		String flag = act.getFlag();
 		String[] split = flag.split(";");
 		for (String a : split) {

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

@@ -8,6 +8,9 @@ import com.jeeplus.modules.sg.managementcenter.activiti.entity.MyNeedList;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import com.jeeplus.modules.sys.entity.DictType;
+import com.jeeplus.modules.sys.entity.DictValue;
+import com.jeeplus.modules.sys.service.DictTypeService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import freemarker.template.Configuration;
 import org.activiti.crystalball.simulator.SimulationRunContext;
@@ -46,6 +49,8 @@ public class MyActiviUtils {
     private static ConstructionService constructionService = SpringContextHolder.getBean(ConstructionService.class);
     @Autowired
     private static ProjectService projectService = SpringContextHolder.getBean(ProjectService.class);
+    @Autowired
+    private static DictTypeService dictTypeService = SpringContextHolder.getBean(DictTypeService.class);
 
     /**
      * 获取下一个用户任务信息
@@ -220,4 +225,12 @@ public class MyActiviUtils {
         Project user = projectService.findUser(procInsId);
         return user;
     }
+
+    /**
+     * 查询项目现在配置模块版本号
+     * */
+    public static DictValue findDic(){
+        DictValue dictValue = dictTypeService.getDictValue("1010101010");
+        return dictValue;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/web/ModuleBlockWeb.java

@@ -10,12 +10,15 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleBlock;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleListing;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleVersion;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.service.ModuleBlockService;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.service.ModuleListingService;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.util.ModuleUtil;
+import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
+import com.jeeplus.modules.sys.entity.DictValue;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -44,6 +47,8 @@ public class ModuleBlockWeb extends BaseController {
 	private ModuleBlockService moduleBlockService;
 	@Autowired
 	private ModuleListingService moduleListingService;
+	@Autowired
+	private PickIngService pickIngService;
 	
 	@ModelAttribute
 	public ModuleBlock get(@RequestParam(required=false) String id) {
@@ -268,4 +273,34 @@ public class ModuleBlockWeb extends BaseController {
 		model.addAttribute("ModuleVersion",moduleVersion);
 		return "modules/sg/managementcenter/moduleacquisition/moduleVersionList";
 	}
+
+	/**
+	 * 选择流程发布版本
+	 */
+	@RequiresPermissions("managementcenter:moduleacquisition:selectVersion")
+	@RequestMapping(value ="selectVersion")
+	public String selectVersion(ModuleVersion moduleVersion, Model model,HttpServletRequest request) {
+		model.addAttribute("ModuleVersion",moduleVersion);
+		List<String> versions = pickIngService.allVersion();
+		DictValue dic = MyActiviUtils.findDic();
+		String dicValue = dic.getValue();
+		model.addAttribute("dicValue", dicValue);
+		model.addAttribute("versions", versions);
+		return "modules/sg/managementcenter/moduleacquisition/selectVersion";
+	}
+
+	/**
+	 * 选择流程发布版本修改
+	 */
+	@ResponseBody
+	@RequiresPermissions("managementcenter:moduleacquisition:selectVersion")
+	@RequestMapping(value = "selectVersionSave")
+	public AjaxJson selectVersionEdit(String version, Model model,HttpServletRequest request){
+		AjaxJson j = new AjaxJson();
+		//新增或编辑表单保存
+		pickIngService.updateSelectVersion(version);
+		j.setSuccess(true);
+		j.setMsg("保存版本成功");
+		return j;
+	}
 }

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

@@ -97,6 +97,9 @@
 			<if test="requireName != null and  requireName != ''">
 				AND a.require_name LIKE CONCAT(CONCAT('%',#{requireName},'%'))
 			</if>
+			<if test="constructionUnitRole != null and  constructionUnitRole != ''">
+				or a.constructionUnitRole = #{constructionUnitRole}
+			</if>
 			<if test="earlyMaterial != null and  earlyMaterial != ''">
 				or a.earlyMaterial = #{earlyMaterial}
 			</if>

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

@@ -6,6 +6,12 @@ import com.jeeplus.core.persistence.DataEntity;
 import java.util.List;
 
 public class ShowList extends ActEntity<ShowList> implements Comparable<ShowList> {
+    //模块大类
+    private String mdBigClass;
+    //模块中类
+    private String mdTheClass;
+    //模块名称
+    private String mdName;
     //物料编码
     private String materialCode;
     //物料名称;
@@ -199,6 +205,30 @@ public class ShowList extends ActEntity<ShowList> implements Comparable<ShowList
         this.mdCount = mdCount;
     }
 
+    public String getMdBigClass() {
+        return mdBigClass;
+    }
+
+    public void setMdBigClass(String mdBigClass) {
+        this.mdBigClass = mdBigClass;
+    }
+
+    public String getMdTheClass() {
+        return mdTheClass;
+    }
+
+    public void setMdTheClass(String mdTheClass) {
+        this.mdTheClass = mdTheClass;
+    }
+
+    public String getMdName() {
+        return mdName;
+    }
+
+    public void setMdName(String mdName) {
+        this.mdName = mdName;
+    }
+
     @Override
     public int compareTo(ShowList o) {
         String materialCode = this.getMaterialCode();

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

@@ -33,5 +33,6 @@ public interface PickIngMapper extends BaseMapper<PickIng> {
 
     ProjectNumber projectNumber(String procInsId);
 
+    void updateSelectVersion(String version);
 
 }

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

@@ -113,4 +113,8 @@
 	<select id="projectNumber" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ProjectNumber">
 		select require_name,the_number from md_acquisition_process as a,xm_project_details as b where a.project_id=b.id and proc_ins_id=#{pprocInsId}
 	</select>
+
+	<update id="updateSelectVersion">
+				UPDATE sys_dict_value set `value` = #{version} where id = '1010101010'
+	</update>
 </mapper>

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

@@ -3,6 +3,9 @@
 <mapper namespace="com.jeeplus.modules.sg.picking.activiti.mapper.ShowListMapper">
 
     <sql id="classColumns">
+		a.md_big_class AS "mdBigClass",
+		a.md_the_class AS "mdTheClass",
+		a.md_name AS "mdName",
 		a.material_code AS "materialCode",
 		a.material_description AS "materialDescription",
 		a.extension_description AS "extensionDescription",

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

@@ -131,4 +131,10 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 	public ProjectNumber projectNumber(String procInsId) {
 		return pickIngMapper.projectNumber(procInsId);
 	}
+
+	@Transactional(readOnly = false)
+	public void updateSelectVersion(String version){
+		pickIngMapper.updateSelectVersion(version);
+	};
+
 }

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

@@ -15,6 +15,7 @@ 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.entity.DictValue;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -254,15 +255,19 @@ public class PickIngController extends BaseController {
                 int i = Integer.parseInt(number);
                 int a = i + 1;
                 showList.setTheNumber(String.valueOf(a));
+                DictValue dic = MyActiviUtils.findDic();
+                String value = dic.getValue();
+                System.out.println(value);
+
             }
-            //新增或编辑表单保存
+/*            //新增或编辑表单保存
             showListService.save(showList);//保存
             // 启动流程
             Map<String, Object> vars = Maps.newHashMap();
             vars.put("manager", "施工经理");
             ProcessDefinition p = actProcessService.getProcessDefinition(showList.getAct().getProcDefId());
             String title = showList.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
-            actTaskService.startProcess(p.getKey(), "md_acquisition_process", showList.getId(), title, vars);
+            actTaskService.startProcess(p.getKey(), "md_acquisition_process", showList.getId(), title, vars);*/
             j.setMsg("发起流程审批成功!");
             j.getBody().put("targetUrl", "/act/task/process/");
 

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

@@ -24,7 +24,9 @@ import java.util.*;
 public class ShowListController extends BaseController {
     @Autowired
     private ShowListService showListService;
-
+    /**
+     * 物料清单显示
+     * */
     @ResponseBody
     @RequestMapping(value ="data")
     public Map<String, Object> data(ShowList showList,String item, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -95,7 +97,6 @@ public class ShowListController extends BaseController {
                         BigDecimal b1 = new BigDecimal(Double.toString(mdTotalAmount));
                         BigDecimal b2 = new BigDecimal(Double.toString(mdTotalAmount1));
                         double v =  b1.add(b2).doubleValue();
-
                         Double mdTotalWeight = list1.getMdTotalWeight();
                         Double mdTotalWeight1 = turn.getMdTotalWeight();
                         BigDecimal a1 = new BigDecimal(Double.toString(mdTotalWeight));
@@ -134,7 +135,7 @@ public class ShowListController extends BaseController {
     }
 
     /**
-     * 模块
+     * 模块清单显示页面
      * */
     @ResponseBody
     @RequestMapping(value ="mkData")
@@ -178,6 +179,9 @@ public class ShowListController extends BaseController {
                         BigDecimal b2 = new BigDecimal(Double.toString(mdCount));
                         double v =  b1.multiply(b2).doubleValue();
                         ShowList newShowList = new ShowList();
+                        newShowList.setMdBigClass(showList1.getMdBigClass());
+                        newShowList.setMdTheClass(showList1.getMdTheClass());
+                        newShowList.setMdName(showList1.getMdName());
                         newShowList.setMaterialCode(showList1.getMaterialCode());
                         newShowList.setMaterialDescription(showList1.getMaterialDescription());
                         newShowList.setExtensionDescription(showList1.getExtensionDescription());

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

@@ -69,14 +69,15 @@
 						<form:hidden path="act.procInsId"/>
 						<form:hidden path="act.procDefId"/>
 						<form:hidden id="flag" path="act.flag" />
+						<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
 						<table class="table table-bordered">
 							<tbody>
 							<tr>
+<%--
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>配网运行人员：</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"/>
 								</td>
+--%>
 
 <%--								<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/managementcenter/moduleacquisition/moduleBlockList.js

@@ -202,6 +202,25 @@ $(document).ready(function() {
             }
         });
     });
+
+	$("#selectVersion").click(function(){//选择流程版本
+		top.layer.open({
+			type: 2,
+			area: ["800px", "500px"],
+			title: "请选择版本",
+			auto:false,
+			maxmin: true, //开启最大化最小化按钮
+			content: "${ctx}/managementcenter/moduleacquisition/selectVersion" ,
+			btn: ['确定', '关闭'],
+			yes: function(index, layero){
+				var iframeWin = layero.find('iframe')[0]; //得到弹出的窗口对象，执行窗口内iframe页的方法：iframeWin.method();
+				iframeWin.contentWindow.save();//调用保存事件，在 弹出页内，需要定义save方法。处理保存事件。
+
+			},
+			cancel: function(index){
+			}
+		});
+	});
 		    
 	  $("#search").click("click", function() {// 绑定查询按扭
 		  $('#moduleBlockTable').bootstrapTable('refresh');

src/main/webapp/webpage/modules/sg/managementcenter/moduleacquisition/moduleBlockList.jsp

@@ -61,7 +61,11 @@
 						<i class="fa fa-file-excel-o"></i> 生成新版本
 					</button>
 				</shiro:hasPermission>
-
+				<shiro:hasPermission name="managementcenter:moduleacquisition:selectVersion">
+					<button id="selectVersion" class="btn btn-warning">
+						<i class="fa fa-file-excel-o"></i> 选择流程使用版本
+					</button>
+				</shiro:hasPermission>
 		    </div>
 		
 	<!-- 表格 -->

src/main/webapp/webpage/modules/sg/managementcenter/moduleacquisition/selectVersion.jsp

@@ -0,0 +1,68 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>修改版本</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<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 selectVersion = $("#selectVersion").val();
+			if (selectVersion==null||selectVersion=="") {
+				jp.error("请选择您想变更的版本号");
+			}else{
+				jp.loading();
+				jp.post("${ctx}/managementcenter/moduleacquisition/selectVersionSave?version="+selectVersion,null,function(data){
+					if(data.success){
+						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="panel panel-primary">
+		<div class="panel-body">
+			<table class="table table-bordered">
+				<tbody>
+				<tr>
+					<td class="width-15 active"><label class="pull-right">现在使用版本：</label></td>
+					<td class="width-35">
+						${dicValue}
+					</td>
+					<td class="width-15 active"><label class="pull-right">选择版本：</label></td>
+					<td class="width-35">
+						<select id="selectVersion" class="form-control">
+							<option value="">请选择版本</option>
+							<c:forEach items="${versions}" var="list">
+								<option value="${list}">${list}</option>
+							</c:forEach>
+						</select>
+					</td>
+				<tr>
+				</tr>
+				</tbody>
+			</table>
+		</div>
+	</div>
+	</div>
+</body>
+</html>

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

@@ -34,21 +34,20 @@
 						</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">
 									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataPicking" 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-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>
+								</td>--%>
 							</tr>
 							<tr>
 							</tr>

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

@@ -153,6 +153,18 @@ $(document).ready(function() {
 		},
 		columns: [
 			{
+				field: 'mdBigClass',
+				title: '模块大类',
+			},
+			{
+				field: 'mdTheClass',
+				title: '模块中类',
+			},
+			{
+				field: 'mdName',
+				title: '模块名称',
+			},
+			{
 				field: 'materialCode',
 				title: '物料编码',
 			},{