Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/entity/MaterialPlan.java

@@ -113,11 +113,12 @@ public class MaterialPlan extends DataEntity<MaterialPlan> {
         this.planToBatch = planToBatch;
     }
     @ExcelField(title="供货计划到日", align=2, sort=12)
-    @JsonFormat(pattern = "YYYY-MM-DD HH:mm:ss")
+    @JsonFormat(pattern = "YYYY-MM-DD")
     public Date getDeliverySchedule() {
         return deliverySchedule;
     }
-    @JsonFormat(pattern = "YYYY-MM-DD HH:mm:ss")
+
+    @JsonFormat(pattern = "YYYY-MM-DD")
     public void setDeliverySchedule(Date deliverySchedule) {
         this.deliverySchedule = deliverySchedule;
     }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/mapper/xml/MaterialPlanMapper.xml

@@ -44,6 +44,18 @@
 			<if test="uniqueCode != null and  uniqueCode != ''">
 				AND a.unique_code LIKE CONCAT(CONCAT('%',#{uniqueCode},'%'))
 			</if>
+			<if test="requireCoding != null and  requireCoding != ''">
+				AND a.require_coding LIKE CONCAT(CONCAT('%',#{requireCoding},'%'))
+			</if>
+			<if test="description != null and  description != ''">
+				AND a.material_description LIKE CONCAT(CONCAT('%',#{description},'%'))
+			</if>
+			<if test="expansionCode != null and  expansionCode != ''">
+				AND a.expansion_code LIKE CONCAT(CONCAT('%',#{expansionCode},'%'))
+			</if>
+			<if test="expansionDescription != null and  expansionDescription != ''">
+				AND a.expansion_description LIKE CONCAT(CONCAT('%',#{expansionDescription},'%'))
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/util/MaterialPlanInfo.java

@@ -54,21 +54,21 @@ public class MaterialPlanInfo {
                 materialPlan.setModerateDescribe((String)importUtil.getCellValue(row,6));
                 materialPlan.setSmallDescribe((String)importUtil.getCellValue(row,7));
                 requireCount =(String)importUtil.getCellValue(row,8);
-                if (null!=requireCount){
+                if (null!=requireCount&&!requireCount.equals("")){
                     materialPlan.setRequireNumber(new Double((String)importUtil.getCellValue(row,8)));
                 }
                 materialPlan.setUtil((String)importUtil.getCellValue(row,9));
                 materialPlan.setPlanToBatch((String)importUtil.getCellValue(row,10));
-                materialPlan.setFlagStorage((String)importUtil.getCellValue(row,12));
-                inventoryQuantity = (String)importUtil.getCellValue(row,13);
-                if (null!=inventoryQuantity){
-                    materialPlan.setInventoryQuantity(new Double((String)importUtil.getCellValue(row,13)));
-                }
-                numberFrozen = (String)importUtil.getCellValue(row,14);
-                if (null!=numberFrozen){
-                    materialPlan.setNumberFrozen(new Double((String)importUtil.getCellValue(row,14)));
-                }
-                materialPlan.setSupplierName((String)importUtil.getCellValue(row,15));
+//                materialPlan.setFlagStorage((String)importUtil.getCellValue(row,12));
+//                inventoryQuantity = (String)importUtil.getCellValue(row,13);
+//                if (null!=inventoryQuantity&&!inventoryQuantity.equals("")){
+//                    materialPlan.setInventoryQuantity(new Double((String)importUtil.getCellValue(row,13)));
+//                }
+//                numberFrozen = (String)importUtil.getCellValue(row,14);
+//                if (null!=numberFrozen&&!inventoryQuantity.equals("")){
+//                    materialPlan.setNumberFrozen(new Double((String)importUtil.getCellValue(row,14)));
+//                }
+//                materialPlan.setSupplierName((String)importUtil.getCellValue(row,15));
                 list.add(materialPlan);
             }
         }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/web/MeterialPlanController.java

@@ -173,7 +173,7 @@ public class MeterialPlanController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("sg:managementcenter:materialplan:import")
     @RequestMapping(value = "import")
-   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
+   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request){
 		AjaxJson j = new AjaxJson();
 		MaterialPlan material = new MaterialPlan();
 		List<MaterialPlan> materialPlanList = materialPlanService.findAllList(material);
@@ -204,6 +204,11 @@ public class MeterialPlanController extends BaseController {
 				}
 			}
 			if (integer==MaterialPlanInfo.MATER_TWO){
+				if (materialPlanList.size()<=0){
+					j.setSuccess(false);
+					j.setMsg("您还没有导入基本信息表");
+					return j;
+				}
 				List<MaterialPlan> updateMaterPlans = MaterialPlanInfo.getUpdateMaterPlan(materialPlanList, importUtil);
 				for (MaterialPlan updateMaterPlan:updateMaterPlans){
 					try{
@@ -217,6 +222,7 @@ public class MeterialPlanController extends BaseController {
 				}
 			}
 			if (integer == MaterialPlanInfo.MATER_THREE){
+
 				boolean judeStorage = MaterialPlanInfo.getJudeStorage(importUtil);
 				if (judeStorage){
 					j.setSuccess(false);

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/entity/MaterialProject.java

@@ -18,6 +18,25 @@ public class MaterialProject extends DataEntity<MaterialProject>{
 
     private String projectStatus;
 
+    private String[] reserveCodes;//储备编码(多条)
+    private String[] projectCodes;//项目编码(多条)
+
+    public String[] getReserveCodes() {
+        return reserveCodes;
+    }
+
+    public void setReserveCodes(String[] reserveCodes) {
+        this.reserveCodes = reserveCodes;
+    }
+
+    public String[] getProjectCodes() {
+        return projectCodes;
+    }
+
+    public void setProjectCodes(String[] projectCodes) {
+        this.projectCodes = projectCodes;
+    }
+
     public String getProjectStatus() {
         return projectStatus;
     }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/mapper/MaterialProjectMapper.java

@@ -17,4 +17,6 @@ public interface MaterialProjectMapper extends BaseMapper<MaterialProject> {
     List<MaterialProject> findByList(@Param("list") List<MaterialProject> list);
 
     Integer insertList(@Param("list") List<MaterialProject> list);
+
+    Integer replaceList(@Param("list") List<MaterialProject> list);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/mapper/xml/MaterialProjectMapper.xml

@@ -35,6 +35,18 @@
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
 			<if test="projectStatus == '' ">
+				<if test="reserveCodes != null ">
+					AND a.reserve_code in
+					<foreach collection="reserveCodes" index="index" item="item" open="(" separator="," close=")">
+						#{item}
+					</foreach>
+				</if>
+				<if test="projectCodes != null ">
+					AND a.project_code in
+					<foreach collection="projectCodes" index="index" item="item" open="(" separator="," close=")">
+						#{item}
+					</foreach>
+				</if>
 				<if test="reserveProjectName != null and reserveProjectName != ''">
 					AND a.reserve_project_name LIKE CONCAT(CONCAT('%',#{reserveProjectName},'%'))
 				</if>
@@ -61,6 +73,18 @@
 				</if>
 			</if>
 			<if test="projectStatus != '' ">
+				<if test="reserveCodes != null ">
+					AND a.reserve_code in
+					<foreach collection="reserveCodes" index="index" item="item" open="(" separator="," close=")">
+						#{item}
+					</foreach>
+				</if>
+				<if test="projectCodes != null ">
+					AND a.project_code in
+					<foreach collection="projectCodes" index="index" item="item" open="(" separator="," close=")">
+						#{item}
+					</foreach>
+				</if>
 				<if test="reserveProjectName != null and reserveProjectName != ''">
 					AND a.reserve_project_name =  #{reserveProjectName}
 				</if>
@@ -203,6 +227,42 @@
 		</foreach>
 	</insert>
 
+	<insert id="replaceList">
+		replace INTO xm_material_project(
+		id,
+		create_by,
+		create_date,
+		update_by,
+		update_date,
+		remarks,
+		del_flag,
+		reserve_project_name,
+		project_name,
+		reserve_code,
+		project_code,
+		project_define,
+		project_attribute,
+		project_batch
+		) VALUES
+		<foreach collection="list" item="item" index="index" separator=",">
+			(
+			#{item.id},
+			#{item.createBy.id},
+			#{item.createDate},
+			#{item.updateBy.id},
+			#{item.updateDate},
+			#{item.remarks},
+			#{item.delFlag},
+			#{item.reserveProjectName},
+			#{item.projectName},
+			#{item.reserveCode},
+			#{item.projectCode},
+			#{item.projectDefine},
+			#{item.projectAttribute},
+			#{item.projectBatch}
+			)
+		</foreach>
+	</insert>
 	<update id="update">
 		UPDATE xm_material_project SET
 			update_by = #{updateBy.id},

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/service/MaterialProjectService.java

@@ -61,4 +61,12 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 		}
 		materialProjectMapper.insertList(list);
 	}
+	//文件导入
+	@Transactional(readOnly = false)
+	public void replaceList(List<MaterialProject> list){
+		for (MaterialProject materialProject:list){
+			materialProject.preInsert();
+		}
+		materialProjectMapper.replaceList(list);
+	}
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/web/MaterialProjectController.java

@@ -80,41 +80,7 @@ public class MaterialProjectController extends BaseController {
 	public Map<String, Object> data(MaterialProject materialProject, HttpServletRequest request, HttpServletResponse response, Model model) {
 		materialProject.setProjectStatus("");
 		MaterialProject materialProject1 = new MaterialProject();
-		materialProject1.setProjectStatus("");
-		materialProject1.setReserveProjectName(materialProject.getReserveProjectName());
-		materialProject1.setProjectName(materialProject.getProjectName());
-		materialProject1.setProjectCode(materialProject.getProjectCode());
-		materialProject1.setReserveCode(materialProject.getReserveCode());
-		materialProject1.setProjectAttribute(materialProject.getProjectAttribute());
-		materialProject1.setProjectDefine(materialProject.getProjectDefine());
-		materialProject1.setProjectBatch(materialProject.getProjectBatch());
-		String strProject = "";
-		if (!materialProject.getReserveProjectName().equals("")){
-			strProject+=materialProject.getReserveProjectName()+",";
-		}
-		if (!materialProject.getProjectName().equals("")){
-			strProject+=materialProject.getReserveProjectName()+",";
-		}
-		if (!materialProject.getProjectCode().equals("")){
-			strProject+=materialProject.getProjectCode()+",";
-		}
-		if (!materialProject.getReserveCode().equals("")){
-			strProject+=materialProject.getReserveCode()+",";
-		}
-		if (!materialProject.getProjectAttribute().equals("")){
-			strProject+=materialProject.getProjectAttribute()+",";
-		}
-		if (!materialProject.getProjectDefine().equals("")){
-			strProject+=materialProject.getProjectDefine()+",";
-		}
-		if (!materialProject.getProjectBatch().equals("")){
-			strProject+=materialProject.getProjectBatch()+",";
-		}
-		String[] split = strProject.split(",");
-		if (split.length>1){
-			materialProject.setProjectStatus("0");
-			materialProject1.setProjectStatus("0");
-		}
+		getSearch(materialProject,materialProject1);
 		HttpSession session = request.getSession();
 		session.setAttribute("materialPro",materialProject1);
 		Page<MaterialProject> page = materialProjectService.findPage(new Page<MaterialProject>(request, response), materialProject);
@@ -200,7 +166,8 @@ public class MaterialProjectController extends BaseController {
             String fileName = "物料"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
 			List<MaterialProject> list = new ArrayList<MaterialProject>();
 			if (!materialProject1.getReserveProjectName().equals("")||!materialProject1.getProjectName().equals("")||!materialProject1.getProjectCode().equals("")||
-					!materialProject1.getReserveCode().equals("")||!materialProject1.getProjectAttribute().equals("")||!materialProject1.getProjectDefine().equals("")){
+					!materialProject1.getReserveCode().equals("")||!materialProject1.getProjectAttribute().equals("")||!materialProject1.getProjectDefine().equals("")
+			||null!=materialProject1.getReserveCodes()||null!=materialProject1.getProjectCodes()){
 				list = materialProjectService.findList(materialProject1);
 			}else {
 				list = materialProjectService.findList(materialProject);
@@ -237,7 +204,8 @@ public class MaterialProjectController extends BaseController {
 //			Page<MaterialProject> page = materialProjectService.findPage(new Page<MaterialProject>(request, response, -1), materialProject);
 			List<MaterialProject> list = null;
 			if (!materialProject1.getReserveProjectName().equals("")||!materialProject1.getProjectName().equals("")||!materialProject1.getProjectCode().equals("")||
-			!materialProject1.getReserveCode().equals("")||!materialProject1.getProjectAttribute().equals("")||!materialProject1.getProjectDefine().equals("")){
+			!materialProject1.getReserveCode().equals("")||!materialProject1.getProjectAttribute().equals("")||!materialProject1.getProjectDefine().equals("")
+			||null!=materialProject1.getReserveCodes()||null!=materialProject1.getProjectCodes()){
 				list = materialProjectService.findList(materialProject1);
 			}else {
 				list = materialProjectService.findList(materialProject);
@@ -260,9 +228,9 @@ public class MaterialProjectController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("managementcenter:materialproject:import")
 	@RequestMapping(value = "import")
-	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
+	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request){
 		AjaxJson j = new AjaxJson();
-//		try {
+		try {
 			ImportUtil importUtil = new ImportUtil(file, 0, 0);
 			Boolean materialProjectFlag = MaterialProUtil.getMaterialProjectFlag(importUtil);
 			if (materialProjectFlag){
@@ -271,15 +239,79 @@ public class MaterialProjectController extends BaseController {
 				return j;
 			}
 			List<MaterialProject> materialProjects = MaterialProUtil.getProjectUtil(importUtil);
-			materialProjectService.savaList(materialProjects);
+			materialProjectService.replaceList(materialProjects);
 			j.setMsg( "已成功导入 "+materialProjects.size()+" 条项目表单记录");
-//		} catch (Exception e) {
-//			j.setSuccess(false);
-//			j.setMsg("导入项目表单失败！失败信息："+e.getMessage());
-//		}
+		} catch (Exception e) {
+			j.setSuccess(false);
+			j.setMsg("导入项目表单失败！失败信息："+e.getMessage());
+		}
 		return j;
 	}
 	
-
+	public void getSearch(MaterialProject materialProject,MaterialProject materialProject1){
+		String reserveCode = materialProject.getReserveCode();
+		String projectCode = materialProject.getProjectCode();
+		if (StringUtils.isNotBlank(reserveCode)){
+			String[] reserveCodes= reserveCode.split("\\s+");
+			if(reserveCodes.length == 1){
+				materialProject.setReserveCode(reserveCodes[0]);
+			}else {
+				materialProject.setReserveCodes(reserveCodes);
+				materialProject.setReserveCode("");
+			}
+		}
+		if (StringUtils.isNotBlank(projectCode)){
+			String[] projectCodes = projectCode.split("\\s+");
+			if(projectCodes.length == 1){
+				materialProject.setProjectCode(projectCodes[0]);
+			}else {
+				materialProject.setProjectCodes(projectCodes);
+				materialProject.setProjectCode("");
+			}
+		}
+		materialProject1.setProjectStatus("");
+		materialProject1.setReserveProjectName(materialProject.getReserveProjectName());
+		materialProject1.setProjectName(materialProject.getProjectName());
+		materialProject1.setProjectCode(materialProject.getProjectCode());
+		materialProject1.setReserveCode(materialProject.getReserveCode());
+		materialProject1.setProjectAttribute(materialProject.getProjectAttribute());
+		materialProject1.setProjectDefine(materialProject.getProjectDefine());
+		materialProject1.setProjectBatch(materialProject.getProjectBatch());
+		materialProject1.setReserveCodes(materialProject.getReserveCodes());
+		materialProject1.setProjectCodes(materialProject.getProjectCodes());
+		String strProject = "";
+		if (!materialProject.getReserveProjectName().equals("")){
+			strProject+=materialProject.getReserveProjectName()+",";
+		}
+		if (!materialProject.getProjectName().equals("")){
+			strProject+=materialProject.getReserveProjectName()+",";
+		}
+		if (!materialProject.getProjectCode().equals("")){
+			strProject+=materialProject.getProjectCode()+",";
+		}
+		if (!materialProject.getReserveCode().equals("")){
+			strProject+=materialProject.getReserveCode()+",";
+		}
+		if (!materialProject.getProjectAttribute().equals("")){
+			strProject+=materialProject.getProjectAttribute()+",";
+		}
+		if (!materialProject.getProjectDefine().equals("")){
+			strProject+=materialProject.getProjectDefine()+",";
+		}
+		if (!materialProject.getProjectBatch().equals("")){
+			strProject+=materialProject.getProjectBatch()+",";
+		}
+		if (null!=materialProject.getProjectCodes()){
+			strProject+=materialProject.getProjectCodes();
+		}
+		if (null!=materialProject.getReserveCodes()){
+			strProject+=materialProject.getReserveCodes();
+		}
+		String[] split = strProject.split(",");
+		if (split.length>1){
+			materialProject.setProjectStatus("0");
+			materialProject1.setProjectStatus("0");
+		}
+	}
 
 }

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

@@ -4,6 +4,7 @@
 package com.jeeplus.modules.sg.managementcenter.moduleacquisition.web;
 
 
+import com.jeeplus.common.config.Global;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ImportExcel;
@@ -73,6 +74,13 @@ public class ModuleBlockWeb extends BaseController {
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(ModuleBlock moduleBlock, HttpServletRequest request, HttpServletResponse response, Model model) {
 		Page<ModuleBlock> page = moduleBlockService.findPage(new Page<ModuleBlock>(request, response), moduleBlock);
+		//当判定系统为linux的时候
+		if (Global.SYS_TYPE.equals("2")) {
+			List<ModuleBlock> list = page.getList();
+			for (ModuleBlock moduleBlock1: list) {
+				moduleBlock1.setMdImg("http://" + request.getServerName()  +moduleBlock1.getMdImg());
+			}
+		}
 		return getBootstrapData(page);
 	}
 	/**
@@ -86,6 +94,13 @@ public class ModuleBlockWeb extends BaseController {
 		Integer version = new Integer(md_version) + 1;
 		moduleBlock.setMdVersion(String.valueOf(version));
 		Page<ModuleBlock> page = moduleBlockService.findPage(new Page<ModuleBlock>(request, response), moduleBlock);
+		//当判定系统为linux的时候
+		if (Global.SYS_TYPE.equals("2")) {
+			List<ModuleBlock> list = page.getList();
+			for (ModuleBlock moduleBlock1: list) {
+				moduleBlock1.setMdImg("http://" + request.getServerName()  +moduleBlock1.getMdImg());
+			}
+		}
 		return getBootstrapData(page);
 	}
 
@@ -136,7 +151,33 @@ public class ModuleBlockWeb extends BaseController {
 		j.setMsg("保存模块成功");
 		return j;
 	}
-	
+
+	/**
+	 * 保存（旧版本）
+	 */
+	@ResponseBody
+	@RequiresPermissions(value={"managementcenter:moduleacquisition:add","managementcenter:moduleacquisition:edit"},logical=Logical.OR)
+	@RequestMapping(value = "saveOld")
+	public AjaxJson saveOld(ModuleBlock moduleBlock, Model model,HttpServletRequest request) throws Exception{
+		AjaxJson j = new AjaxJson();
+		/**
+		 * 后台hibernate-validation插件校验
+		 */
+		String errMsg = beanValidator(moduleBlock);
+		if (StringUtils.isNotBlank(errMsg)){
+			j.setSuccess(false);
+			j.setMsg(errMsg);
+			return j;
+		}
+		//新增或编辑表单保存
+
+		moduleBlock.setMdVersion(moduleBlock.getMdVersion());
+		moduleBlockService.save(moduleBlock);//保存
+		j.setSuccess(true);
+		j.setMsg("保存模块成功");
+		return j;
+	}
+
 	/**
 	 * 删除项目
 	 */

src/main/webapp/webpage/modules/sg/managementcenter/materialplan/materialplanForm.jsp

@@ -97,7 +97,7 @@
 					<td class="width-15 active"><label class="">供货计划到日：</label></td>
 					<td class="width-35">
 						<div class='input-group form_datetime' id='deliverySchedule'>
-							<input type='text'  name="deliverySchedule" class="form-control required"  value="<fmt:formatDate value="${materialPlan.deliverySchedule}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+							<input type='text'  name="deliverySchedule" class="form-control required"  value="<fmt:formatDate value="${materialPlan.deliverySchedule}" pattern="yyyy-MM-dd"/>"/>
 								<span class="input-group-addon">
 			                        <span class="glyphicon glyphicon-calendar"></span>
 			                    </span>

src/main/webapp/webpage/modules/sg/managementcenter/materialplan/materialplanList.jsp

@@ -25,6 +25,22 @@
 						<form:input path="uniqueCode" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="需求物资编码：">需求物资编码：</label>
+						<form:input path="requireCoding" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="物料描述：">物料描述：</label>
+						<form:input path="description" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="物料扩展编码：">物料扩展编码：</label>
+						<form:input path="expansionCode" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="物料扩展描述：">物料扩展描述：</label>
+						<form:input path="expansionDescription" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
 						<div style="margin-top:26px">
 							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>

src/main/webapp/webpage/modules/sg/managementcenter/materialproject/materialProjectList.jsp

@@ -65,16 +65,16 @@
 	
 		<!-- 工具栏 -->
 			<div id="toolbar">
-				<shiro:hasPermission name="managementcenter:materialproject:import">
-					<button id="btnImport" class="btn btn-info">
-						<i class="fa fa-folder-open-o"></i> 导入
-					</button>
-				</shiro:hasPermission>
 				<shiro:hasPermission name="managementcenter:materialproject:del">
 					<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
 						<i class="glyphicon glyphicon-remove"></i> 删除
 					</button>
 				</shiro:hasPermission>
+				<shiro:hasPermission name="managementcenter:materialproject:import">
+					<button id="btnImport" class="btn btn-info">
+						<i class="fa fa-folder-open-o"></i> 导入
+					</button>
+				</shiro:hasPermission>
 				<shiro:hasPermission name="managementcenter:materialproject:export">
 						<button id="export" class="btn btn-warning">
 						<i class="fa fa-file-excel-o"></i> 导出物料

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

@@ -20,7 +20,7 @@
             if (null!=mdImg&&mdImg!=""){
                 var valueArray = mdImg.split(",");
                 if (valueArray.length>1){
-                    alert("只允许上传一张");
+                    jp.error("只允许上传一张");
                     return false;
 				}
 			}
@@ -29,7 +29,7 @@
                 return false;
 			}else{
                 jp.loading();
-                jp.post("${ctx}/managementcenter/moduleacquisition/save",$('#inputForm').serialize(),function(data){
+                jp.post("${ctx}/managementcenter/moduleacquisition/saveOld",$('#inputForm').serialize(),function(data){
                     if(data.success){
                         jp.getParent().refresh();
                         var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
@@ -50,6 +50,7 @@
 		<form:hidden path="id"/>	
 		<table class="table table-bordered">
 			<tbody>
+				<form:input id="versionId"  path="mdVersion" htmlEscape="false" class="form-control" type="hidden"/>
 				<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/managementcenter/moduleacquisition/moduleBlockList.js

@@ -114,8 +114,10 @@ $(document).ready(function() {
                        formatter:function(value, row , index){
                        		if (value!=null&&value!=""){
                                 var valueArray = value.split("|");
+                                console.log(valueArray)
                                 var labelArray = [];
                                 for(var i =0 ; i<valueArray.length; i++){
+                                    console.log(valueArray[i])
                                     if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
                                     {
                                         labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"

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

@@ -20,7 +20,7 @@
             if (null!=mdImg&&mdImg!=""){
                 var valueArray = mdImg.split(",");
                 if (valueArray.length>1){
-                    alert("只允许上传一张");
+                    jp.error("只允许上传一张");
                     return false;
                 }
             }