修改

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/entity/MaterialProvided.java

@@ -0,0 +1,119 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.materialProvided.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import com.jeeplus.core.persistence.DataEntity;
+import com.jeeplus.modules.sys.entity.Office;
+import com.jeeplus.modules.sys.entity.User;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+public class MaterialProvided extends DataEntity<MaterialProvided> {
+
+	private static final long serialVersionUID = 1L;
+
+	private Integer serialNumber;//序号
+	private String planToBatch;//计划批次
+	private String caseInformation;//分标信息
+	private String materialExtension;//物料加扩展
+	private String materialCode;//物料编码
+	private String materialDescription;//物料描述
+	private String extendedCode;//扩展编码
+	private String extendedDescription;//扩展编码描述
+	private String measuringUnit;//计量单位
+	private Double referencePrice;//参考概算价格
+	private Integer version;//版本号
+
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+	@ExcelField(title="计划批次", align=2, sort=1)
+	public String getPlanToBatch() {
+		return planToBatch;
+	}
+
+	public void setPlanToBatch(String planToBatch) {
+		this.planToBatch = planToBatch;
+	}
+	@ExcelField(title="分标信息", align=2, sort=2)
+	public String getCaseInformation() {
+		return caseInformation;
+	}
+
+	public void setCaseInformation(String caseInformation) {
+		this.caseInformation = caseInformation;
+	}
+	@ExcelField(title="物料加扩展", align=2, sort=3)
+	public String getMaterialExtension() {
+		return materialExtension;
+	}
+
+	public void setMaterialExtension(String materialExtension) {
+		this.materialExtension = materialExtension;
+	}
+	@ExcelField(title="物料编码", align=2, sort=4)
+	public String getMaterialCode() {
+		return materialCode;
+	}
+
+	public void setMaterialCode(String materialCode) {
+		this.materialCode = materialCode;
+	}
+	@ExcelField(title="物料描述", align=2, sort=5)
+	public String getMaterialDescription() {
+		return materialDescription;
+	}
+
+	public void setMaterialDescription(String materialDescription) {
+		this.materialDescription = materialDescription;
+	}
+	@ExcelField(title="扩展编码", align=2, sort=6)
+	public String getExtendedCode() {
+		return extendedCode;
+	}
+
+	public void setExtendedCode(String extendedCode) {
+		this.extendedCode = extendedCode;
+	}
+	@ExcelField(title="扩展编码描述", align=2, sort=7)
+	public String getExtendedDescription() {
+		return extendedDescription;
+	}
+
+	public void setExtendedDescription(String extendedDescription) {
+		this.extendedDescription = extendedDescription;
+	}
+	@ExcelField(title="计量单位", align=2, sort=8)
+	public String getMeasuringUnit() {
+		return measuringUnit;
+	}
+
+	public void setMeasuringUnit(String measuringUnit) {
+		this.measuringUnit = measuringUnit;
+	}
+	@ExcelField(title="参考概算价值", align=2, sort=9)
+	public Double getReferencePrice() {
+		return referencePrice;
+	}
+
+	public void setReferencePrice(Double referencePrice) {
+		this.referencePrice = referencePrice;
+	}
+	@ExcelField(title="版本号", align=2, sort=10)
+	public Integer getVersion() {
+		return version;
+	}
+
+	public void setVersion(Integer version) {
+		this.version = version;
+	}
+}
+

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/mapper/MaterialProvidedMapper.java

@@ -0,0 +1,18 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.materialProvided.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@MyBatisMapper
+public interface MaterialProvidedMapper extends BaseMapper<MaterialProvided> {
+    public Integer insertList(@Param("list") List<MaterialProvided> list);
+    Integer findMaxVersion();
+    List<MaterialProvided> findAllVersion(MaterialProvided materialProvided);
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/mapper/xml/MaterialProvidedMapper.xml

@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.sg.managementcenter.materialProvided.mapper.MaterialProvidedMapper">
+    
+	<sql id="materialColumns">
+		a.id AS "id",
+		a.create_by As "createBy.id",
+		a.create_date As "createDate",
+		a.update_by As "updateBy.id",
+		a.update_date As "updateDate",
+		a.remarks As "remarks",
+		a.del_flag As "delFlag",
+		a.serialNumber As "serialNumber",
+		a.planToBatch As "planToBatch",
+		a.caseInformation As "caseInformation",
+		a.materialExtension As "materialExtension",
+		a.materialCode As "materialCode",
+		a.materialDescription As "materialDescription",
+		a.extendedCode As "extendedCode",
+		a.extendedDescription As "extendedDescription",
+		a.measuringUnit As "measuringUnit",
+		a.referencePrice As "referencePrice",
+		a.version AS "version"
+
+	</sql>
+	<select id="get" resultType="MaterialProvided" >
+		SELECT 
+			<include refid="materialColumns"/>
+		FROM xm_material_provided a
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="MaterialProvided" >
+		SELECT
+			<include refid="materialColumns"/>
+		FROM xm_material_provided a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="MaterialProvided" >
+		SELECT
+			<include refid="materialColumns"/>
+		FROM xm_material_provided a
+			<include refid="materialColumns"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO xm_material_provided(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+			serialNumber,
+			planToBatch,
+			caseInformation,
+			materialExtension,
+			materialCode,
+			materialDescription,
+			extendedCode,
+			extendedDescription,
+			measuringUnit,
+			referencePrice,
+			version
+		) VALUES (
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag},
+			#{serialNumber},
+			#{planToBatch},
+			#{caseInformation},
+			#{materialExtension},
+			#{materialCode},
+			#{materialDescription},
+			#{extendedCode},
+			#{extendedDescription},
+			#{measuringUnit},
+			#{referencePrice},
+			#{version}
+		)
+	</insert>
+
+	<insert id="insertList">
+		replace INTO xm_material_provided(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+			serialNumber,
+			planToBatch,
+			caseInformation,
+			materialExtension,
+			materialCode,
+			materialDescription,
+			extendedCode,
+			extendedDescription,
+			measuringUnit,
+			referencePrice,
+			version
+		) 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.serialNumber},
+			#{item.planToBatch},
+			#{item.caseInformation},
+			#{item.materialExtension},
+			#{item.materialCode},
+			#{item.materialDescription},
+			#{item.extendedCode},
+			#{item.extendedDescription},
+			#{item.measuringUnit},
+			#{item.referencePrice},
+			#{item.version}
+			)
+		</foreach>
+	</insert>
+
+	<update id="update">
+		UPDATE xm_material_provided SET
+
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM xm_material_provided
+		WHERE id = #{id}
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE xm_material_provided SET
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
+	<select id="findUniqueByProperty" resultType="MaterialProvided" statementType="STATEMENT">
+		select * FROM xm_material_provided  where ${propertyName} = '${value}'
+	</select>
+
+	<!-- 查找最大的版本号 -->
+	<select id="findMaxVersion" resultType="java.lang.Integer">
+		select version from xm_material_provided group by version order by version desc LIMIT 1
+	</select>
+
+	<select id="findAllVersion" resultType="com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided">
+		select version from xm_material_provided
+		<where>
+			del_flag = '0'
+		</where>
+		group by version order by version DESC
+	</select>
+</mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/service/MaterialProvidedService.java

@@ -0,0 +1,64 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.materialProvided.service;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.mapper.MaterialProvidedMapper;
+import com.jeeplus.modules.test.one.dialog.entity.Leave1;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(readOnly = true)
+public class MaterialProvidedService extends CrudService<MaterialProvidedMapper, MaterialProvided> {
+	@Autowired
+	private MaterialProvidedMapper materialProvidedMapper;
+
+	public MaterialProvided get(String id) {
+		return super.get(id);
+	}
+	
+	public List<MaterialProvided> findList(MaterialProvided materialProvided) {
+		return super.findList(materialProvided);
+	}
+	
+	public Page<MaterialProvided> findPage(Page<MaterialProvided> page, MaterialProvided materialProvided) {
+		return super.findPage(page, materialProvided);
+	}
+	
+	@Transactional(readOnly = false)
+	public void save(MaterialProvided materialProvided) {
+		super.save(materialProvided);
+	}
+	
+	@Transactional(readOnly = false)
+	public void delete(MaterialProvided materialProvided) {
+		super.delete(materialProvided);
+	}
+
+	public Integer findMaxVersion(){
+		return materialProvidedMapper.findMaxVersion();
+	}
+
+	@Transactional(readOnly = false)
+	public void saveList(List<MaterialProvided> list,Integer version) {
+		if (null==version){
+			version = 0;
+		}
+		for(MaterialProvided materialProvided : list){
+			materialProvided.preInsert();
+			materialProvided.setVersion(version+1);
+		}
+		materialProvidedMapper.insertList(list);
+	}
+
+	public List<MaterialProvided> findAllVersion(MaterialProvided materialProvided){
+		return materialProvidedMapper.findAllVersion(materialProvided);
+	}
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/util/ImportPro.java

@@ -0,0 +1,66 @@
+package com.jeeplus.modules.sg.managementcenter.materialProvided.util;
+
+import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Row;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class ImportPro {
+    /**
+     * 获取表格数据
+     * @param importUtil
+     * @return List<ErpAccount> 导入表格数据
+     */
+    public static List<MaterialProvided> getMaterProUtil(ImportUtil importUtil)  {
+        int lastRow = importUtil.getLastDataRowNum();
+        List<MaterialProvided> list = new ArrayList<MaterialProvided>();
+        MaterialProvided materialProvided = null;
+        String materialCode="";//物料编码
+        for(int i=1; i<lastRow;i++){
+            materialProvided = new MaterialProvided();
+            Row row = importUtil.getRow(i);
+            materialCode = (String)importUtil.getCellValue(row,5);
+            if (StringUtils.isNotBlank(materialCode)){
+                materialProvided.setMaterialCode(materialCode);//物料编码
+                //序号
+                materialProvided.setSerialNumber(new Integer((String)importUtil.getCellValue(row,0)));
+                //计划批次
+                materialProvided.setPlanToBatch((String)importUtil.getCellValue(row,1));
+                //分标信息
+                materialProvided.setCaseInformation((String)importUtil.getCellValue(row,2));
+                //物料加扩展
+                materialProvided.setMaterialExtension((String)importUtil.getCellValue(row,3));
+                //物料编码
+                materialProvided.setMaterialCode((String)importUtil.getCellValue(row,4));
+                //物料描述
+                materialProvided.setMaterialDescription((String)importUtil.getCellValue(row,6));
+                //扩展编码
+                materialProvided.setExtendedCode((String)importUtil.getCellValue(row,7));
+                //扩展编码描述
+                materialProvided.setExtendedDescription((String)importUtil.getCellValue(row,8));
+                //计量单位
+                materialProvided.setMeasuringUnit((String)importUtil.getCellValue(row,9));
+                //参考概算价格
+                materialProvided.setReferencePrice(new Double((String)importUtil.getCellValue(row,10)));
+                list.add(materialProvided);
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 生成随机数
+     * @return
+     */
+    public static String getStatus(){
+        int machineId = 1;
+        int hashCodeV = UUID.randomUUID().toString().hashCode();
+        if (hashCodeV<0){
+            hashCodeV=-hashCodeV;
+        }
+        return  (machineId+String.format("%015d",hashCodeV));
+    }
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialProvided/util/ImportUtil.java

@@ -0,0 +1,394 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.materialProvided.util;
+
+import com.google.common.collect.Lists;
+import com.jeeplus.common.utils.Reflections;
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import com.jeeplus.modules.sys.entity.Area;
+import com.jeeplus.modules.sys.entity.Office;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.DictUtils;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 导入Excel文件（支持“XLS”和“XLSX”格式）
+ * @author jeeplus
+ * @version 2016-03-10
+ */
+public class ImportUtil {
+
+	private static Logger log = LoggerFactory.getLogger(ImportUtil.class);
+
+	/**
+	 * 工作薄对象
+	 */
+	private Workbook wb;
+
+	/**
+	 * 工作表对象
+	 */
+	private Sheet sheet;
+
+	/**
+	 * 标题行号
+	 */
+	private int headerNum;
+
+	/**
+	 * 构造函数
+	 * @param path 导入文件，读取第一个工作表
+	 * @param headerNum 标题行号，数据行号=标题行号+1
+	 * @throws InvalidFormatException
+	 * @throws IOException
+	 */
+	public ImportUtil(String fileName, int headerNum)
+			throws InvalidFormatException, IOException {
+		this(new File(fileName), headerNum);
+	}
+
+	/**
+	 * 构造函数
+	 * @param path 导入文件对象，读取第一个工作表
+	 * @param headerNum 标题行号，数据行号=标题行号+1
+	 * @throws InvalidFormatException
+	 * @throws IOException
+	 */
+	public ImportUtil(File file, int headerNum)
+			throws InvalidFormatException, IOException {
+		this(file, headerNum, 0);
+	}
+
+	/**
+	 * 构造函数
+	 * @param path 导入文件
+	 * @param headerNum 标题行号，数据行号=标题行号+1
+	 * @param sheetIndex 工作表编号
+	 * @throws InvalidFormatException
+	 * @throws IOException
+	 */
+	public ImportUtil(String fileName, int headerNum, int sheetIndex)
+			throws InvalidFormatException, IOException {
+		this(new File(fileName), headerNum, sheetIndex);
+	}
+
+	/**
+	 * 构造函数
+	 * @param path 导入文件对象
+	 * @param headerNum 标题行号，数据行号=标题行号+1
+	 * @param sheetIndex 工作表编号
+	 * @throws InvalidFormatException
+	 * @throws IOException
+	 */
+	public ImportUtil(File file, int headerNum, int sheetIndex)
+			throws InvalidFormatException, IOException {
+		this(file.getName(), new FileInputStream(file), headerNum, sheetIndex);
+	}
+
+	/**
+	 * 构造函数
+	 * @param file 导入文件对象
+	 * @param headerNum 标题行号，数据行号=标题行号+1
+	 * @param sheetIndex 工作表编号
+	 * @throws InvalidFormatException
+	 * @throws IOException
+	 */
+	public ImportUtil(MultipartFile multipartFile, int headerNum, int sheetIndex)
+			throws InvalidFormatException, IOException {
+		this(multipartFile.getOriginalFilename(), multipartFile.getInputStream(), headerNum, sheetIndex);
+	}
+
+	/**
+	 * 构造函数
+	 * @param path 导入文件对象
+	 * @param headerNum 标题行号，数据行号=标题行号+1
+	 * @param sheetIndex 工作表编号
+	 * @throws InvalidFormatException
+	 * @throws IOException
+	 */
+	public ImportUtil(String fileName, InputStream is, int headerNum, int sheetIndex)
+			throws InvalidFormatException, IOException {
+		if (StringUtils.isBlank(fileName)){
+			throw new RuntimeException("导入文档为空!");
+		}else if(fileName.toLowerCase().endsWith("xls")){    
+			this.wb = new HSSFWorkbook(is);    
+        }else if(fileName.toLowerCase().endsWith("xlsx")){  
+        	this.wb = new XSSFWorkbook(is);
+        }else{  
+        	throw new RuntimeException("文档格式不正确!");
+        }  
+		if (this.wb.getNumberOfSheets()<sheetIndex){
+			throw new RuntimeException("文档中没有工作表!");
+		}
+		this.sheet = this.wb.getSheetAt(sheetIndex);
+		this.headerNum = headerNum;
+		log.debug("Initialize success.");
+	}
+	
+	/**
+	 * 获取行对象
+	 * @param rownum
+	 * @return
+	 */
+	public Row getRow(int rownum){
+		return this.sheet.getRow(rownum);
+	}
+
+	/**
+	 * 获取数据行号
+	 * @return
+	 */
+	public int getDataRowNum(){
+		return headerNum+1;
+	}
+	
+	/**
+	 * 获取最后一个数据行号
+	 * @return
+	 */
+	public int getLastDataRowNum(){
+		return this.sheet.getLastRowNum()+headerNum;
+	}
+	
+	/**
+	 * 获取最后一个列号
+	 * @return
+	 */
+	public int getLastCellNum(){
+		return this.getRow(headerNum).getLastCellNum();
+	}
+	
+	/**
+	 * 获取单元格值
+	 * @param row 获取的行
+	 * @param column 获取单元格列号
+	 * @return 单元格值
+	 */
+	public Object getCellValue(Row row, int column) {
+		Object val = "";
+		try {
+			Cell cell = row.getCell(column);
+			if (cell != null) {
+				if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC) {
+					// val = cell.getNumericCellValue();
+					// 当excel 中的数据为数值或日期是需要特殊处理
+					if (HSSFDateUtil.isCellDateFormatted(cell)) {
+						double d = cell.getNumericCellValue();
+						Date date = HSSFDateUtil.getJavaDate(d);
+						SimpleDateFormat dformat = new SimpleDateFormat(
+								"yyyy-MM-dd");
+						val = dformat.format(date);
+					} else {
+						NumberFormat nf = NumberFormat.getInstance();
+						nf.setGroupingUsed(false);// true时的格式：1,234,567,890
+						val = nf.format(cell.getNumericCellValue());// 数值类型的数据为double，所以需要转换一下
+					}
+				} else if (cell.getCellType() == Cell.CELL_TYPE_STRING) {
+					val = cell.getStringCellValue();
+				} else if (cell.getCellType() == Cell.CELL_TYPE_FORMULA) {
+					val = cell.getCellFormula();
+				} else if (cell.getCellType() == Cell.CELL_TYPE_BOOLEAN) {
+					val = cell.getBooleanCellValue();
+				} else if (cell.getCellType() == Cell.CELL_TYPE_ERROR) {
+					val = cell.getErrorCellValue();
+				}
+			}
+		} catch (Exception e) {
+			return val;
+		}
+		return val;
+	}
+	
+	/**
+	 * 获取导入数据列表
+	 * @param cls 导入对象类型
+	 * @param groups 导入分组
+	 */
+	public <E> List<E> getDataList(Class<E> cls, int... groups) throws InstantiationException, IllegalAccessException{
+		List<Object[]> annotationList = Lists.newArrayList();
+		// Get annotation field 
+		Field[] fs = cls.getDeclaredFields();
+		for (Field f : fs){
+			ExcelField ef = f.getAnnotation(ExcelField.class);
+			if (ef != null && (ef.type()==0 || ef.type()==2)){
+				if (groups!=null && groups.length>0){
+					boolean inGroup = false;
+					for (int g : groups){
+						if (inGroup){
+							break;
+						}
+						for (int efg : ef.groups()){
+							if (g == efg){
+								inGroup = true;
+								annotationList.add(new Object[]{ef, f});
+								break;
+							}
+						}
+					}
+				}else{
+					annotationList.add(new Object[]{ef, f});
+				}
+			}
+		}
+		// Get annotation method
+		Method[] ms = cls.getDeclaredMethods();
+		for (Method m : ms){
+			ExcelField ef = m.getAnnotation(ExcelField.class);
+			if (ef != null && (ef.type()==0 || ef.type()==2)){
+				if (groups!=null && groups.length>0){
+					boolean inGroup = false;
+					for (int g : groups){
+						if (inGroup){
+							break;
+						}
+						for (int efg : ef.groups()){
+							if (g == efg){
+								inGroup = true;
+								annotationList.add(new Object[]{ef, m});
+								break;
+							}
+						}
+					}
+				}else{
+					annotationList.add(new Object[]{ef, m});
+				}
+			}
+		}
+		// Field sorting
+		Collections.sort(annotationList, new Comparator<Object[]>() {
+			public int compare(Object[] o1, Object[] o2) {
+				return new Integer(((ExcelField)o1[0]).sort()).compareTo(
+						new Integer(((ExcelField)o2[0]).sort()));
+			};
+		});
+		//log.debug("Import column count:"+annotationList.size());
+		// Get excel data
+		List<E> dataList = Lists.newArrayList();
+		for (int i = this.getDataRowNum(); i < this.getLastDataRowNum(); i++) {
+			E e = (E)cls.newInstance();
+			int column = 0;
+			Row row = this.getRow(i);
+			StringBuilder sb = new StringBuilder();
+			for (Object[] os : annotationList){
+				Object val = this.getCellValue(row, column++);
+				if (val != null){
+					ExcelField ef = (ExcelField)os[0];
+					// If is dict type, get dict value
+					if (StringUtils.isNotBlank(ef.dictType())){
+						val = DictUtils.getDictValue(val.toString(), ef.dictType(), "");
+						//log.debug("Dictionary type value: ["+i+","+colunm+"] " + val);
+					}
+					// Get param type and type cast
+					Class<?> valType = Class.class;
+					if (os[1] instanceof Field){
+						valType = ((Field)os[1]).getType();
+					}else if (os[1] instanceof Method){
+						Method method = ((Method)os[1]);
+						if ("get".equals(method.getName().substring(0, 3))){
+							valType = method.getReturnType();
+						}else if("set".equals(method.getName().substring(0, 3))){
+							valType = ((Method)os[1]).getParameterTypes()[0];
+						}
+					}
+					//log.debug("Import value type: ["+i+","+column+"] " + valType);
+					try {
+						//如果导入的java对象，需要在这里自己进行变换。
+						if (valType == String.class){
+							String s = String.valueOf(val.toString());
+							if(StringUtils.endsWith(s, ".0")){
+								val = StringUtils.substringBefore(s, ".0");
+							}else{
+								val = String.valueOf(val.toString());
+							}
+						}else if (valType == Integer.class){
+							val = Double.valueOf(val.toString()).intValue();
+						}else if (valType == Long.class){
+							val = Double.valueOf(val.toString()).longValue();
+						}else if (valType == Double.class){
+							val = Double.valueOf(val.toString());
+						}else if (valType == Float.class){
+							val = Float.valueOf(val.toString());
+						}else if (valType == Date.class){
+							SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+							val=sdf.parse(val.toString()); 
+						}else if (valType == User.class){
+							val = UserUtils.getByUserName(val.toString());
+						}else if (valType == Office.class){
+							val = UserUtils.getByOfficeName(val.toString());
+						}else if (valType == Area.class){
+							val = UserUtils.getByAreaName(val.toString());
+						}else{
+							if (ef.fieldType() != Class.class){
+								val = ef.fieldType().getMethod("getValue", String.class).invoke(null, val.toString());
+							}else{
+								val = Class.forName(this.getClass().getName().replaceAll(this.getClass().getSimpleName(), 
+										"fieldtype."+valType.getSimpleName()+"Type")).getMethod("getValue", String.class).invoke(null, val.toString());
+							}
+						}
+					} catch (Exception ex) {
+						log.info("Get cell value ["+i+","+column+"] error: " + ex.toString());
+						val = null;
+					}
+					// set entity value
+					if (os[1] instanceof Field){
+						Reflections.invokeSetter(e, ((Field)os[1]).getName(), val);
+					}else if (os[1] instanceof Method){
+						String mthodName = ((Method)os[1]).getName();
+						if ("get".equals(mthodName.substring(0, 3))){
+							mthodName = "set"+StringUtils.substringAfter(mthodName, "get");
+						}
+						Reflections.invokeMethod(e, mthodName, new Class[] {valType}, new Object[] {val});
+					}
+				}
+				sb.append(val+", ");
+			}
+			dataList.add(e);
+			log.debug("Read success: ["+i+"] "+sb.toString());
+		}
+		return dataList;
+	}
+
+//	/**
+//	 * 导入测试
+//	 */
+//	public static void main(String[] args) throws Throwable {
+//		
+//		ImportExcel ei = new ImportExcel("target/export.xlsx", 1);
+//		
+//		for (int i = ei.getDataRowNum(); i < ei.getLastDataRowNum(); i++) {
+//			Row row = ei.getRow(i);
+//			for (int j = 0; j < ei.getLastCellNum(); j++) {
+//				Object val = ei.getCellValue(row, j);
+//				System.out.print(val+", ");
+//			}
+//			System.out.print("\n");
+//		}
+//		
+//	}
+}

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

@@ -0,0 +1,183 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.materialProvided.web;
+
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.utils.DateUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.excel.ExportExcel;
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.service.MaterialProvidedService;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.util.ImportPro;
+import com.jeeplus.modules.sg.managementcenter.materialProvided.util.ImportUtil;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.ConstraintViolationException;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping(value = "${adminPath}/sg/managementcenter/marterialProvided")
+public class MaterialProvidedController extends BaseController {
+
+	@Autowired
+	private MaterialProvidedService materialProvidedService;
+	
+	@ModelAttribute
+	public MaterialProvided get(@RequestParam(required=false) String id) {
+		MaterialProvided entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = materialProvidedService.get(id);
+		}
+		if (entity == null){
+			entity = new MaterialProvided();
+		}
+		return entity;
+	}
+	
+	/**
+	 * 列表页面
+	 */
+	@RequiresPermissions("managementcenter:materialProvided:list")
+	@RequestMapping(value = {"list", ""})
+	public String list(MaterialProvided materialProvided, Model model) {
+		model.addAttribute("materialProvided", materialProvided);
+		return "modules/sg/managementcenter/materialProvided/materialProvided";
+	}
+
+		/**
+	 * 列表数据
+	 */
+	@ResponseBody
+	@RequiresPermissions("managementcenter:materialProvided:list")
+	@RequestMapping(value = "data")
+	public Map<String, Object> data(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)
+	@RequestMapping(value = "form")
+	public String form(MaterialProvided materialProvided, Model model) {
+		List<MaterialProvided> allVersion = materialProvidedService.findAllVersion(materialProvided);
+		model.addAttribute("allVersion",allVersion);
+		model.addAttribute("materialProvided", materialProvided);
+		return "modules/sg/managementcenter/materialProvided/materialProvidedForm";
+	}
+
+	/**
+	 * 保存表单
+	 */
+	@ResponseBody
+	@RequiresPermissions(value={"managementcenter:materialProvided:add","managementcenter:materialProvided:edit"},logical=Logical.OR)
+	@RequestMapping(value = "save")
+	public AjaxJson save(MaterialProvided materialProvided, Model model) throws Exception{
+		AjaxJson j = new AjaxJson();
+		/**
+		 * 后台hibernate-validation插件校验
+		 */
+		String errMsg = beanValidator(materialProvided);
+		if (StringUtils.isNotBlank(errMsg)){
+			j.setSuccess(false);
+			j.setMsg(errMsg);
+			return j;
+		}
+		//新增或编辑表单保存
+		materialProvidedService.save(materialProvided);//保存
+		j.setSuccess(true);
+		j.setMsg("保存甲供标准物资成功");
+		return j;
+	}
+	
+	/**
+	 * 删除表单
+	 */
+	@ResponseBody
+	@RequiresPermissions("managementcenter:materialProvided:del")
+	@RequestMapping(value = "delete")
+	public AjaxJson delete(MaterialProvided materialProvided) {
+		AjaxJson j = new AjaxJson();
+		materialProvidedService.delete(materialProvided);
+		j.setMsg("删除甲供标准物资成功");
+		return j;
+	}
+	
+	/**
+	 * 批量表单
+	 */
+	@ResponseBody
+	@RequiresPermissions("managementcenter:materialProvided:del")
+	@RequestMapping(value = "deleteAll")
+	public AjaxJson deleteAll(String ids) {
+		AjaxJson j = new AjaxJson();
+		String idArray[] =ids.split(",");
+		for(String id : idArray){
+			materialProvidedService.delete(materialProvidedService.get(id));
+		}
+		j.setMsg("删除请假表单成功");
+		return j;
+	}
+	
+	/**
+	 * 导出excel文件
+	 */
+	@ResponseBody
+	@RequiresPermissions("managementcenter:materialProvided:export")
+    @RequestMapping(value = "export")
+    public AjaxJson exportFile(MaterialProvided materialProvided, HttpServletRequest request, HttpServletResponse response) {
+		AjaxJson j = new AjaxJson();
+		try {
+            String fileName = "甲供标准物资"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+            Page<MaterialProvided> page = materialProvidedService.findPage(new Page<MaterialProvided>(request, response, -1), materialProvided);
+    		new ExportExcel("甲供标准物资", MaterialProvided.class).setDataList(page.getList()).write(response, fileName).dispose();
+    		j.setSuccess(true);
+    		j.setMsg("导出成功！");
+    		return j;
+		} catch (Exception e) {
+			j.setSuccess(false);
+			j.setMsg("导出甲供标准物资记录失败！失败信息："+e.getMessage());
+		}
+			return j;
+    }
+
+	/**
+	 * 导入Excel数据
+
+	 */
+	@ResponseBody
+	@RequiresPermissions("managementcenter:materialProvided:import")
+    @RequestMapping(value = "import")
+   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
+		AjaxJson j = new AjaxJson();
+		try {
+			StringBuilder failureMsg = new StringBuilder();
+			ImportUtil importUtil = new ImportUtil(file,1,0);
+			List<MaterialProvided> materProUtil = ImportPro.getMaterProUtil(importUtil);
+			Integer maxVersion = materialProvidedService.findMaxVersion();
+			materialProvidedService.saveList(materProUtil,maxVersion);
+			j.setMsg( "已成功导入甲供标准物资记录"+failureMsg);
+		} catch (Exception e) {
+			j.setSuccess(false);
+			j.setMsg("导入甲供标准物资失败！失败信息："+e.getMessage());
+		}
+		return j;
+    }
+
+}

src/main/webapp/webpage/modules/sg/managementcenter/materialProvided/materialProvided.js

@@ -0,0 +1,291 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	$('#materialProvidedTable').bootstrapTable({
+		 
+		  //请求方法
+               method: 'post',
+               //类型json
+               dataType: "json",
+               contentType: "application/x-www-form-urlencoded",
+               //显示检索按钮
+	           showSearch: true,
+               //显示刷新按钮
+               showRefresh: true,
+               //显示切换手机试图按钮
+               showToggle: true,
+               //显示 内容列下拉框
+    	       showColumns: true,
+    	       //显示到处按钮
+    	       showExport: true,
+    	       //显示切换分页按钮
+    	       showPaginationSwitch: true,
+    	       //最低显示2行
+    	       minimumCountColumns: 2,
+               //是否显示行间隔色
+               striped: true,
+               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
+               cache: false,    
+               //是否显示分页（*）  
+               pagination: true,   
+                //排序方式 
+               sortOrder: "asc",  
+               //初始化加载第一页，默认第一页
+               pageNumber:1,   
+               //每页的记录行数（*）   
+               pageSize: 10,  
+               //可供选择的每页的行数（*）    
+               pageList: [10, 25, 50, 100],
+               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
+               url: "${ctx}/sg/managementcenter/marterialProvided/data",
+               //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+               //queryParamsType:'',   
+               ////查询参数,每次调用是会带上这个参数，可自定义                         
+               queryParams : function(params) {
+               	var searchParam = $("#searchForm").serializeJSON();
+               	searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
+               	searchParam.pageSize = params.limit === undefined? -1 : params.limit;
+               	searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+  params.order;
+                   return searchParam;
+               },
+               //分页方式：client客户端分页，server服务端分页（*）
+               sidePagination: "server",
+               contextMenuTrigger:"right",//pc端 按右键弹出菜单
+               contextMenuTriggerMobile:"press",//手机端 弹出菜单，click：单击， press：长按。
+               contextMenu: '#context-menu',
+               onContextMenuItem: function(row, $el){
+                   if($el.data("item") == "edit"){
+                   		edit(row.id);
+                   }else if($el.data("item") == "view"){
+                       view(row.id);
+                   } else if($el.data("item") == "delete"){
+                        jp.confirm('确认要删除该请假表单记录吗？', function(){
+                       	jp.loading();
+                       	jp.get("${ctx}/sg/managementcenter/marterialProvided/delete?id="+row.id, function(data){
+                   	  		if(data.success){
+                   	  			$('#materialProvidedTable').bootstrapTable('refresh');
+                   	  			jp.success(data.msg);
+                   	  		}else{
+                   	  			jp.error(data.msg);
+                   	  		}
+                   	  	})
+
+                   	});
+
+                   }
+               },
+              
+               onClickRow: function(row, $el){
+               },
+                onLoadSuccess:function(data){
+                    jQuery(function(){
+                        //使用id选择器;例如:tab对象->tr->td对象.
+                        $("#materialProvidedTable tr td").each(function(i){
+                            //获取td当前对象的文本,如果长度大于25;
+                            if($(this).text().length>20){
+                                //给td设置title属性,并且设置td的完整值.给title属性.
+                                $(this).attr("title",$(this).text());
+                                //获取td的值,进行截取。赋值给text变量保存.
+                                var text=$(this).text().substring(0,20)+"...";
+                                //重新为td赋值;
+                                $(this).text(text);
+                            }
+                        });
+                    });
+                },
+               	onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+               columns: [
+                   {
+		        checkbox: true
+		    	}
+                   ,{
+                       field: 'materialCode',
+                       width:130,
+                       title: '物料编码'
+                       ,formatter:function(value, row , index){
+
+                           if(value == null || value ==""){
+                               value = "-";
+                           }
+                       <c:choose>
+                           <c:when test="${fns:hasPermission('managementcenter:materialProvided:view')}">
+                           return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
+                       </c:when>
+                           <c:otherwise>
+                           return value;
+                       </c:otherwise>
+                           </c:choose>
+
+                       }
+                   }
+                   ,{
+                       field: 'materialDescription',
+                       width:160,
+                       title: '物料描述'
+                   }
+                   ,{
+                       field: 'extendedCode',
+                       width:80,
+                       title: '扩展编码'
+                   }
+                   ,{
+                       field: 'extendedDescription',
+                       width:160,
+                       title: '扩展编码描述'
+                   }
+                   ,{
+                       field: 'materialExtension',
+                       width:120,
+                       title: '物料加扩展'
+                   }
+                   ,{
+                       field: 'planToBatch',
+                       width:120,
+                       title: '计划批次'
+                   }
+                   ,{
+                       field: 'caseInformation',
+                       width:160,
+                       title: '分标信息'
+                   }
+                   ,{
+                       field: 'measuringUnit',
+                       width:80,
+                       title: '计量单位'
+                   }
+                   ,{
+                       field: 'referencePrice',
+                       width:110,
+                       title: '参考概算价值'
+                   }
+                   ,{
+                       field: 'version',
+                       width:80,
+                       title: '版本号'
+                   }
+		     ]
+		
+		});
+		
+		  
+	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+
+		 
+		  $('#materialProvidedTable').bootstrapTable("toggleView");
+		}
+	  
+	  $('#materialProvidedTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+                'check-all.bs.table uncheck-all.bs.table', function () {
+            $('#remove').prop('disabled', ! $('#materialProvidedTable').bootstrapTable('getSelections').length);
+            $('#view,#edit').prop('disabled', $('#materialProvidedTable').bootstrapTable('getSelections').length!=1);
+        });
+		  
+		$("#btnImport").click(function(){
+			jp.open({
+			    type: 2,
+                area: [500, 200],
+                auto: true,
+			    title:"导入数据",
+			    content: "${ctx}/tag/importExcel" ,
+			    btn: ['确定', '关闭'],
+			    btn1: function(index, layero){
+				        var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+						iframeWin.contentWindow.importExcel('${ctx}/sg/managementcenter/marterialProvided/import', function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								refresh();
+							}else{
+								jp.error(data.msg);
+							}
+                            jp.close(index);
+						});//调用保存事件
+						return false;
+				  },
+
+				  btn2: function(index){
+					//  jp.close(index);
+	    	       }
+			}); 
+		});
+		
+		
+	 $("#export").click(function(){//导出Excel文件
+			jp.downloadFile('${ctx}/sg/managementcenter/marterialProvided/export');
+	  });
+
+		    
+	  $("#search").click("click", function() {// 绑定查询按扭
+		  $('#materialProvidedTable').bootstrapTable('refresh');
+		});
+	 
+	 $("#reset").click("click", function() {// 绑定查询按扭
+		  $("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $("#searchForm  .select-item").html("");
+		  $('#materialProvidedTable').bootstrapTable('refresh');
+		});
+		
+		$('#beginBeginDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		$('#endBeginDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		$('#endDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		
+	});
+		
+  function getIdSelections() {
+        return $.map($("#materialProvidedTable").bootstrapTable('getSelections'), function (row) {
+            return row.id
+        });
+    }
+  
+  function deleteAll(){
+
+		jp.confirm('确认要删除该甲供标准物资表单记录吗？', function(){
+			jp.loading();  	
+			jp.get("${ctx}/sg/managementcenter/marterialProvided/deleteAll?ids=" + getIdSelections(), function(data){
+         	  		if(data.success){
+         	  			$('#materialProvidedTable').bootstrapTable('refresh');
+         	  			jp.success(data.msg);
+         	  		}else{
+         	  			jp.error(data.msg);
+         	  		}
+         	  	})
+          	   
+		})
+  }
+
+    //刷新列表
+  function refresh(){
+  	$('#materialProvidedTable').bootstrapTable('refresh');
+  }
+  
+   function add(){
+	  jp.openSaveDialog('新增甲供标准物资表单', "${ctx}/sg/managementcenter/marterialProvided/form",'800px', '500px');
+  }
+
+
+  //
+  //  function edit(id){//没有权限时，不显示确定按钮
+  //      if(id == undefined){
+	//       id = getIdSelections();
+	// }
+	// jp.openSaveDialog('编辑甲供标准物资表单', "${ctx}/sg/managementcenter/marterialProvided/form?id=" + id, '800px', '500px');
+  // }
+  
+ function view(id){//没有权限时，不显示确定按钮
+      if(id == undefined){
+          id = getIdSelections();
+      }
+      jp.openViewDialog('查看甲供标准物资表单', "${ctx}/sg/managementcenter/marterialProvided/form?id=" + id, '800px', '500px');
+ }
+
+
+
+</script>

src/main/webapp/webpage/modules/sg/managementcenter/materialProvided/materialProvided.jsp

@@ -0,0 +1,122 @@
+<%@ 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" %>
+	<%@include file="materialProvided.js" %>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">甲供标准物资列表</h3>
+	</div>
+	<div class="panel-body">
+	
+	<!-- 搜索 -->
+	<div id="search-collapse" class="collapse">
+		<div class="accordion-inner">
+			<form:form id="searchForm" modelAttribute="materialProvided" class="form form-horizontal well clearfix">
+				<div class="col-xs-12 col-sm-6 col-md-4">
+					<label class="label-item single-overflow pull-left" title="计划批次：">计划批次：</label>
+					<form:input path="planToBatch" htmlEscape="false" maxlength="64"  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="caseInformation" htmlEscape="false" maxlength="64"  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="materialExtension" htmlEscape="false" maxlength="64"  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="materialCode" htmlEscape="false" maxlength="64"  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="materialDescription" htmlEscape="false" maxlength="64"  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="extendedCode" htmlEscape="false" maxlength="64"  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="extendedDescription" htmlEscape="false" maxlength="64"  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="measuringUnit" htmlEscape="false" maxlength="64"  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="version" htmlEscape="false" maxlength="64"  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>
+					</div>
+				</div>
+			</form:form>
+		</div>
+	</div>
+	
+	<!-- 工具栏 -->
+	<div id="toolbar">
+			<shiro:hasPermission name="managementcenter:materialProvided:add">
+				<button id="add" class="btn btn-primary" onclick="add()">
+					<i class="glyphicon glyphicon-plus"></i> 新建
+				</button>
+			</shiro:hasPermission>
+			<%--<shiro:hasPermission name="managementcenter:materialProvided:edit">--%>
+			    <%--<button id="edit" class="btn btn-success" disabled onclick="edit()">--%>
+	            	<%--<i class="glyphicon glyphicon-edit"></i> 修改--%>
+	        	<%--</button>--%>
+			<%--</shiro:hasPermission>--%>
+			<%--<shiro:hasPermission name="managementcenter:materialProvided:del">--%>
+				<%--<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">--%>
+	            	<%--<i class="glyphicon glyphicon-remove"></i> 删除--%>
+	        	<%--</button>--%>
+			<%--</shiro:hasPermission>--%>
+			<shiro:hasPermission name="managementcenter:materialProvided:import">
+				<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
+			</shiro:hasPermission>
+			<shiro:hasPermission name="managementcenter:materialProvided:export">
+	        		<button id="export" class="btn btn-warning">
+					<i class="fa fa-file-excel-o"></i> 导出
+				</button>
+			 </shiro:hasPermission>
+			<%--<shiro:hasPermission name="managementcenter:materialProvided:view">--%>
+				<%--<button id="view" class="btn btn-default" disabled onclick="view()">--%>
+					<%--<i class="fa fa-search-plus"></i> 查看--%>
+				<%--</button>--%>
+			<%--</shiro:hasPermission>--%>
+		    </div>
+		
+	<!-- 表格 -->
+	<table id="materialProvidedTable"  style="table-layout:fixed"  data-toolbar="#toolbar"></table>
+
+    <!-- context menu -->
+    <ul id="context-menu" class="dropdown-menu">
+    	<shiro:hasPermission name="managementcenter:materialProvided:view">
+        <li data-item="view"><a>查看</a></li>
+        </shiro:hasPermission>
+    	<shiro:hasPermission name="managementcenter:materialProvided:edit">
+        <li data-item="edit"><a>编辑</a></li>
+        </shiro:hasPermission>
+        <shiro:hasPermission name="managementcenter:materialProvided:del">
+        <li data-item="delete"><a>删除</a></li>
+        </shiro:hasPermission>
+        <li data-item="action1"><a>取消</a></li>
+    </ul>  
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/materialProvided/materialProvidedForm.jsp

@@ -0,0 +1,110 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>甲供标准物资</title>
+	<meta name="decorator" content="ani"/>
+	<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 (null==selectVersion||""==selectVersion){
+                jp.error("请选择版本！");
+			}else {
+		        $("#version").val(selectVersion);
+                var isValidate = jp.validateForm('#inputForm');//校验表单
+                if(!isValidate){
+                    return false;
+                }else{
+                    jp.loading();
+                    jp.post("${ctx}/sg/managementcenter/marterialProvided/save",$('#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 class="bg-white">
+		<form:form id="inputForm" modelAttribute="materialProvided" class="form-horizontal">
+		<form:hidden path="id"/>	
+		<table class="table table-bordered">
+		   	<tbody>
+				<tr>
+					<input type="hidden" id="version" name="version" value=""/>
+					<td class="width-15 active"><label class=""><font color="red">*</font>计划批次：</label></td>
+					<td class="width-35">
+						<form:input path="planToBatch" htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>选择版本：</label></td>
+					<td class="width-35">
+						<select id="selectVersion" class="form-control required">
+							<option value="" id="option1">请选择版本</option>
+							<c:forEach items="${allVersion}" var="list">
+								<option value="${list.version}">${list.version}</option>
+							</c:forEach>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>物料编码：</label></td>
+					<td class="width-35">
+						<form:input path="materialCode" htmlEscape="false" class="form-control required "/>
+					</td>
+					<td class="width-15 active"><label class="">物料加扩展：</label></td>
+					<td class="width-35">
+						<form:input path="materialExtension" htmlEscape="false" class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">物料描述：</label></td>
+					<td class="width-35">
+						<form:input path="materialDescription" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">扩展编码：</label></td>
+					<td class="width-35">
+						<form:input path="extendedCode" htmlEscape="false" class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">扩展编码描述：</label></td>
+					<td class="width-35">
+						<form:input path="extendedDescription" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">计量单位：</label></td>
+					<td class="width-35">
+						<form:input path="measuringUnit" htmlEscape="false" class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">分标信息：</label></td>
+					<td class="width-35">
+						<form:input path="caseInformation" htmlEscape="false" class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">参考概算价格：</label></td>
+					<td class="width-35">
+						<form:input path="referencePrice" htmlEscape="false" class="form-control number"/>
+					</td>
+				</tr>
+		 	</tbody>
+		</table>
+	</form:form>
+</body>
+</html>