库存物料管理

src/main/java/com/jeeplus/modules/sg/managementcenter/materialInventory/entity/MaterialRequisition.java

@@ -0,0 +1,32 @@
+package com.jeeplus.modules.sg.managementcenter.materialInventory.entity;
+
+public class MaterialRequisition {
+    private String materialCode;//物料编码
+    private Double requireCount;//需求数量
+    private Double outCount;//已经出库数量
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    public Double getRequireCount() {
+        return requireCount;
+    }
+
+    public void setRequireCount(Double requireCount) {
+        this.requireCount = requireCount;
+    }
+
+    public Double getOutCount() {
+        return outCount;
+    }
+
+    public void setOutCount(Double outCount) {
+        this.outCount = outCount;
+    }
+
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialInventory/mapper/MaterialInventoryMapper.java

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

src/main/java/com/jeeplus/modules/sg/managementcenter/materialInventory/mapper/xml/MaterialInventoryMapper.xml

@@ -0,0 +1,185 @@
+<?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.materialInventory.mapper.MaterialInventoryMapper">
+    
+	<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.materialCode	AS  "materialCode",
+		a.materialDetail	AS  "materialDetail",
+		a.stockQuantity	AS  "stockQuantity",
+		a.frozenQuantity	AS  "frozenQuantity",
+		a.requireCount AS "requireCount",
+		a.outCount AS "outCount",
+	    a.availableStockQuantity AS "availableStockQuantity"
+	</sql>
+	<select id="get" resultType="MaterialInventory" >
+		SELECT 
+			<include refid="materialColumns"/>
+		FROM xm_material_inventory a
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="MaterialInventory" >
+		SELECT
+			<include refid="materialColumns"/>
+		FROM xm_material_inventory a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+			<if test="materialCode != null and materialCode != '' ">
+				AND materialCode LIKE CONCAT(CONCAT('%',#{materialCode},'%'))
+			</if>
+		</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="MaterialInventory" >
+		SELECT
+			<include refid="materialColumns"/>
+		FROM xm_material_inventory 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">
+		replace INTO xm_material_inventory(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+			materialCode,
+			materialDetail,
+			stockQuantity,
+			frozenQuantity,
+			requireCount,
+			outCount,
+			availableStockQuantity
+		) VALUES (
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag},
+			#{materialCode},
+			#{materialDetail},
+			#{stockQuantity},
+			#{frozenQuantity},
+			#{requireCount},
+			#{outCount},
+		  	#{availableStockQuantity}
+		)
+	</insert>
+
+	<insert id="insertList">
+		replace INTO xm_material_inventory(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+			materialCode,
+			materialDetail,
+			stockQuantity,
+			frozenQuantity,
+			requireCount,
+			outCount,
+			availableStockQuantity
+		) 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.materialCode},
+			#{item.materialDetail},
+			#{item.stockQuantity},
+			#{item.frozenQuantity},
+			#{item.requireCount},
+			#{item.outCount},
+			#{item.availableStockQuantity}
+			)
+		</foreach>
+	</insert>
+
+	<update id="update">
+		UPDATE xm_material_inventory SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks},
+			materialCode = #{materialCode},
+			materialDetail = #{materialDetail},
+			stockQuantity =#{stockQuantity},
+			frozenQuantity =#{frozenQuantity},
+			requireCount = #{requireCount},
+			outCount = #{outCount},
+			availableStockQuantity =#{availableStockQuantity}
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM xm_material_inventory
+		WHERE id = #{id}
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE xm_material_inventory SET
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
+	<select id="findUniqueByProperty" resultType="MaterialInventory" statementType="STATEMENT">
+		select * FROM xm_material_inventory  where ${propertyName} = '${value}'
+	</select>
+
+	<select id="findByList" resultType="com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory">
+		SELECT
+		<include refid="materialColumns"/>
+		FROM xm_material_inventory a
+		<where>
+			a.materialCode in
+			<foreach collection="list" item="item" open="(" close=")" separator=",">
+				#{item.materialCode}
+			</foreach>
+		</where>
+	</select>
+</mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/materialInventory/service/MaterialInventoryService.java

@@ -0,0 +1,56 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.materialInventory.service;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory;
+import com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialRequisition;
+import com.jeeplus.modules.sg.managementcenter.materialInventory.mapper.MaterialInventoryMapper;
+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 MaterialInventoryService extends CrudService<MaterialInventoryMapper, MaterialInventory> {
+	@Autowired
+	private MaterialInventoryMapper materialInventoryMapper;
+
+	public MaterialInventory get(String id) {
+		return super.get(id);
+	}
+	
+	public List<MaterialInventory> findList(MaterialInventory materialInventory) {
+		return super.findList(materialInventory);
+	}
+	
+	public Page<MaterialInventory> findPage(Page<MaterialInventory> page, MaterialInventory materialInventory) {
+		return super.findPage(page, materialInventory);
+	}
+	
+	@Transactional(readOnly = false)
+	public void save(MaterialInventory materialInventory) {
+		super.save(materialInventory);
+	}
+	
+	@Transactional(readOnly = false)
+	public void delete(MaterialInventory materialInventory) {
+		super.delete(materialInventory);
+	}
+
+	@Transactional(readOnly = false)
+	public void saveList(List<MaterialInventory> list) {
+		for(MaterialInventory materialInventory : list){
+			materialInventory.preInsert();
+		}
+		materialInventoryMapper.insertList(list);
+	}
+
+	public List<MaterialInventory> findByList(List<MaterialRequisition> list){
+		return materialInventoryMapper.findByList(list);
+	}
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialInventory/web/MaterialInventoryController.java

@@ -0,0 +1,221 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.materialInventory.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.materialInventory.entity.MaterialInventory;
+import com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialRequisition;
+import com.jeeplus.modules.sg.managementcenter.materialInventory.service.MaterialInventoryService;
+import com.jeeplus.modules.sg.managementcenter.materialInventory.util.ImportPro;
+import com.jeeplus.modules.sg.managementcenter.materialInventory.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 java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping(value = "${adminPath}/sg/managementcenter/materialInventory")
+public class MaterialInventoryController extends BaseController {
+
+	@Autowired
+	private MaterialInventoryService materialInventoryService;
+	
+	@ModelAttribute
+	public MaterialInventory get(@RequestParam(required=false) String id) {
+		MaterialInventory entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = materialInventoryService.get(id);
+		}
+		if (entity == null){
+			entity = new MaterialInventory();
+		}
+		return entity;
+	}
+	
+	/**
+	 * 列表页面
+	 */
+	@RequiresPermissions("managementcenter:materialInventory:list")
+	@RequestMapping(value = {"list", ""})
+	public String list(MaterialInventory materialInventory, Model model) {
+		model.addAttribute("materialInventory", materialInventory);
+		return "modules/sg/managementcenter/materialInventory/materialInventory";
+	}
+
+		/**
+	 * 列表数据
+	 */
+	@ResponseBody
+	@RequiresPermissions("managementcenter:materialInventory:list")
+	@RequestMapping(value = "data")
+	public Map<String, Object> data(MaterialInventory materialInventory, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<MaterialInventory> page = materialInventoryService.findPage(new Page<MaterialInventory>(request, response), materialInventory);
+		return getBootstrapData(page);
+	}
+
+	/**
+	 * 查看，增加，编辑表单页面
+	 */
+	@RequiresPermissions(value={"managementcenter:materialInventory:view","managementcenter:materialInventory:add","managementcenter:materialInventory:edit"},logical=Logical.OR)
+	@RequestMapping(value = "form")
+	public String form(MaterialInventory materialInventory, Model model) {
+		model.addAttribute("marterialInventory",materialInventory);
+		return "modules/sg/managementcenter/materialInventory/materialInventoryForm";
+	}
+
+	/**
+	 * 保存表单
+	 */
+	@ResponseBody
+	@RequiresPermissions(value={"managementcenter:materialInventory:add","managementcenter:materialInventory:edit"},logical=Logical.OR)
+	@RequestMapping(value = "save")
+	public AjaxJson save(MaterialInventory materialInventory, Model model) throws Exception{
+		AjaxJson j = new AjaxJson();
+		/**
+		 * 后台hibernate-validation插件校验
+		 */
+		String errMsg = beanValidator(materialInventory);
+		if (StringUtils.isNotBlank(errMsg)){
+			j.setSuccess(false);
+			j.setMsg(errMsg);
+			return j;
+		}
+		//新增或编辑表单保存
+		materialInventoryService.save(materialInventory);//保存
+		j.setSuccess(true);
+		j.setMsg("保存库存成功");
+		return j;
+	}
+	
+	/**
+	 * 删除表单
+	 */
+	@ResponseBody
+	@RequiresPermissions("managementcenter:materialInventory:del")
+	@RequestMapping(value = "delete")
+	public AjaxJson delete(MaterialInventory materialInventory) {
+		AjaxJson j = new AjaxJson();
+		materialInventoryService.delete(materialInventory);
+		j.setMsg("删除库存成功");
+		return j;
+	}
+	
+	/**
+	 * 批量表单
+	 */
+	@ResponseBody
+	@RequiresPermissions("managementcenter:materialInventory:del")
+	@RequestMapping(value = "deleteAll")
+	public AjaxJson deleteAll(String ids) {
+		AjaxJson j = new AjaxJson();
+		String idArray[] =ids.split(",");
+		for(String id : idArray){
+			materialInventoryService.delete(materialInventoryService.get(id));
+		}
+		j.setMsg("删除请假表单成功");
+		return j;
+	}
+	
+	/**
+	 * 导出excel文件
+	 */
+	@ResponseBody
+	@RequiresPermissions("managementcenter:materialInventory:export")
+    @RequestMapping(value = "export")
+    public AjaxJson exportFile(MaterialInventory materialInventory, HttpServletRequest request, HttpServletResponse response) {
+		AjaxJson j = new AjaxJson();
+		try {
+            String fileName = "库存"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+            Page<MaterialInventory> page = materialInventoryService.findPage(new Page<MaterialInventory>(request, response, -1), materialInventory);
+    		new ExportExcel("库存", MaterialInventory.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:materialInventory: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);
+			boolean judgeInventory = ImportPro.getJudgeInventory(importUtil);
+			if (judgeInventory){
+				j.setSuccess(false);
+				j.setMsg("导入失败：表格不符合规范!");
+				return j;
+			}
+			List<MaterialInventory> materialInventoryUtil = ImportPro.getMaterialInventoryUtil(importUtil);
+			List<MaterialInventory> materialInventories = ImportPro.getSetMaterialInvenntory(materialInventoryUtil);//去重
+			materialInventoryService.saveList(materialInventories);
+			j.setMsg( "已成功导入"+materialInventories.size()+"条,"+"库存记录"+failureMsg);
+		} catch (Exception e) {
+			j.setSuccess(false);
+			j.setMsg("导入库存失败！失败信息："+e.getMessage());
+		}
+		return j;
+    }
+    /**
+     * 导入Excel数据
+		导入附件五2
+     */
+    @ResponseBody
+    @RequiresPermissions("managementcenter:materialInventory:import")
+    @RequestMapping(value = "import1")
+    public AjaxJson importFile1(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request){
+        AjaxJson j = new AjaxJson();
+        try {
+            StringBuilder failureMsg = new StringBuilder();
+            ImportUtil importUtil = new ImportUtil(file,1,0);
+			boolean judgeRequisition = ImportPro.getJudgeRequisition(importUtil);
+			if (judgeRequisition){
+				j.setSuccess(false);
+				j.setMsg("导入失败：表格不符合规范!");
+				return j;
+			}
+			List<MaterialRequisition> materialRequisitionUtil = ImportPro.getMaterialRequisitionUtil(importUtil);//得到数据表格
+			List<MaterialRequisition> materialRequisitionList = ImportPro.getSetMaterialRequisition(materialRequisitionUtil);//去重
+			List<MaterialInventory> byList = materialInventoryService.findByList(materialRequisitionList);//得到数据库中匹配的物料编码
+			if (null==byList||byList.size()<=0){
+				j.setSuccess(false);
+				j.setMsg("导入领料单失败！失败信息：无基础数据");
+				return j;
+			}
+			List<MaterialInventory> materialInventories = ImportPro.getMaterial(byList, materialRequisitionList);//得到可使用库存数量
+			materialInventoryService.saveList(materialInventories);
+			j.setMsg( "已成功导入"+materialInventories.size()+"条,"+"领料单记录"+failureMsg);
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("导入领料单失败！失败信息："+e.getMessage());
+        }
+        return j;
+    }
+}

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

@@ -0,0 +1,306 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	$('#materialInventoryTable').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/materialInventory/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/materialInventory/delete?id="+row.id, function(data){
+                   	  		if(data.success){
+                   	  			$('#materialInventoryTable').bootstrapTable('refresh');
+                   	  			jp.success(data.msg);
+                   	  		}else{
+                   	  			jp.error(data.msg);
+                   	  		}
+                   	  	})
+
+                   	});
+
+                   }
+               },
+              
+               onClickRow: function(row, $el){
+               },
+                onLoadSuccess:function(data){
+                    jQuery(function(){
+                        //使用id选择器;例如:tab对象->tr->td对象.
+                        $("#materialInventoryTable tr td").each(function(i){
+                            //获取td当前对象的文本,如果长度大于25;
+                            if($(this).text().length>23){
+                                //给td设置title属性,并且设置td的完整值.给title属性.
+                                $(this).attr("title",$(this).text());
+                                //获取td的值,进行截取。赋值给text变量保存.
+                                var text=$(this).text().substring(0,23)+"...";
+                                //重新为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:materialInventory:edit')}">
+                           return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
+                       </c:when>
+                           <c:when test="${fns:hasPermission('managementcenter:materialInventory:view')}">
+                           return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
+                       </c:when>
+                           <c:otherwise>
+                           return value;
+                       </c:otherwise>
+                           </c:choose>
+
+                       }
+                   }
+                   ,{
+                       field: 'materialDetail',
+                       width:210,
+                       title: '物料描述'
+                   }
+                   ,{
+                       field: 'stockQuantity',
+                       width:120,
+                       title: '非限制库存数量'
+                   }
+                   ,{
+                       field: 'frozenQuantity',
+                       width:120,
+                       title: '已冻结库存数量'
+                   }
+                   ,{
+                       field: 'requireCount',
+                       width:120,
+                       title: '需求数量'
+                   }
+                   ,{
+                       field: 'outCount',
+                       width:120,
+                       title: '已出库数量'
+                   }
+                   ,{
+                       field: 'availableStockQuantity',
+                       width:130,
+                       title: '可用库存数量'
+                   }
+		     ]
+		
+		});
+		
+		  
+	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+
+		 
+		  $('#materialInventoryTable').bootstrapTable("toggleView");
+		}
+	  
+	  $('#materialInventoryTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+                'check-all.bs.table uncheck-all.bs.table', function () {
+            $('#remove').prop('disabled', ! $('#materialInventoryTable').bootstrapTable('getSelections').length);
+            $('#view,#edit').prop('disabled', $('#materialInventoryTable').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/materialInventory/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);
+	    	       }
+			}); 
+		});
+    $("#btnImport1").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/materialInventory/import1', 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/materialInventory/export');
+	  });
+
+		    
+	  $("#search").click("click", function() {// 绑定查询按扭
+		  $('#materialInventoryTable').bootstrapTable('refresh');
+		});
+	 
+	 $("#reset").click("click", function() {// 绑定查询按扭
+		  $("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $("#searchForm  .select-item").html("");
+		  $('#materialInventoryTable').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($("#materialInventoryTable").bootstrapTable('getSelections'), function (row) {
+            return row.id
+        });
+    }
+  
+  function deleteAll(){
+
+		jp.confirm('确认要删除库存物料管理表单记录吗？', function(){
+			jp.loading();  	
+			jp.get("${ctx}/sg/managementcenter/materialInventory/deleteAll?ids=" + getIdSelections(), function(data){
+         	  		if(data.success){
+         	  			$('#materialInventoryTable').bootstrapTable('refresh');
+         	  			jp.success(data.msg);
+         	  		}else{
+         	  			jp.error(data.msg);
+         	  		}
+         	  	})
+          	   
+		})
+  }
+
+    //刷新列表
+  function refresh(){
+  	$('#materialInventoryTable').bootstrapTable('refresh');
+  }
+  
+   function add(){
+	  jp.openSaveDialog('新增库存物料管理表单', "${ctx}/sg/managementcenter/materialInventory/form",'800px', '500px');
+  }
+
+
+  //
+   function edit(id){//没有权限时，不显示确定按钮
+       if(id == undefined){
+	      id = getIdSelections();
+	}
+	jp.openSaveDialog('编辑库存物料管理表单', "${ctx}/sg/managementcenter/materialInventory/form?id=" + id, '800px', '500px');
+  }
+  
+ function view(id){//没有权限时，不显示确定按钮
+      if(id == undefined){
+          id = getIdSelections();
+      }
+      jp.openViewDialog('查看库存物料管理表单', "${ctx}/sg/managementcenter/materialInventory/form?id=" + id, '800px', '500px');
+ }
+
+
+
+</script>

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

@@ -0,0 +1,93 @@
+<%@ 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="materialInventory.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="materialInventory" 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="materialCode" 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:materialInventory:add">
+				<button id="add" class="btn btn-primary" onclick="add()">
+					<i class="glyphicon glyphicon-plus"></i> 新建
+				</button>
+			</shiro:hasPermission>
+			<%--<shiro:hasPermission name="managementcenter:materialInventory:edit">--%>
+			    <%--<button id="edit" class="btn btn-success" disabled onclick="edit()">--%>
+	            	<%--<i class="glyphicon glyphicon-edit"></i> 修改--%>
+	        	<%--</button>--%>
+			<%--</shiro:hasPermission>--%>
+			<shiro:hasPermission name="managementcenter:materialInventory:del">
+				<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
+	            	<i class="glyphicon glyphicon-remove"></i> 删除
+	        	</button>
+			</shiro:hasPermission>
+			<shiro:hasPermission name="managementcenter:materialInventory:import">
+				<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入库存表</button>
+			</shiro:hasPermission>
+            <shiro:hasPermission name="managementcenter:materialInventory:import">
+                <button id="btnImport1" class="btn btn-info"><i class="fa fa-folder-open-o"></i>导入领料单</button>
+            </shiro:hasPermission>
+			<shiro:hasPermission name="managementcenter:materialInventory:export">
+	        		<button id="export" class="btn btn-warning">
+					<i class="fa fa-file-excel-o"></i> 导出
+				</button>
+			 </shiro:hasPermission>
+			<%--<shiro:hasPermission name="managementcenter:materialInventory:view">--%>
+				<%--<button id="view" class="btn btn-default" disabled onclick="view()">--%>
+					<%--<i class="fa fa-search-plus"></i> 查看--%>
+				<%--</button>--%>
+			<%--</shiro:hasPermission>--%>
+		    </div>
+		
+	<!-- 表格 -->
+	<table id="materialInventoryTable"  style="table-layout:fixed"  data-toolbar="#toolbar"></table>
+
+    <!-- context menu -->
+    <ul id="context-menu" class="dropdown-menu">
+    	<shiro:hasPermission name="managementcenter:materialInventory:view">
+        <li data-item="view"><a>查看</a></li>
+        </shiro:hasPermission>
+    	<shiro:hasPermission name="managementcenter:materialInventory:edit">
+        <li data-item="edit"><a>编辑</a></li>
+        </shiro:hasPermission>
+        <shiro:hasPermission name="managementcenter:materialInventory: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/materialInventory/materialInventoryForm.jsp

@@ -0,0 +1,84 @@
+<%@ 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 isValidate = jp.validateForm('#inputForm');//校验表单
+            if(!isValidate){
+                return false;
+            }else{
+                jp.loading();
+                jp.post("${ctx}/sg/managementcenter/materialInventory/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="materialInventory" class="form-horizontal">
+		<form:hidden path="id"/>	
+		<table class="table table-bordered">
+		   	<tbody>
+                <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=""><font color="red">*</font>物料描述：</label></td>
+                    <td class="width-35">
+                        <form:input path="materialDetail" htmlEscape="false" class="form-control required"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="width-15 active"><label class=""><font color="red">*</font>非限制性库存数量：</label></td>
+                    <td class="width-35">
+                        <form:input path="stockQuantity" htmlEscape="false" class="form-control required number"/>
+                    </td>
+                    <td class="width-15 active"><label class=""><font color="red">*</font>已冻结库存数量：</label></td>
+                    <td class="width-35">
+                        <form:input path="frozenQuantity" htmlEscape="false" class="form-control required number"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="width-15 active"><label class=""><font color="red">*</font>需求数量：</label></td>
+                    <td class="width-35">
+                        <form:input path="requireCount" htmlEscape="false" class="form-control required number"/>
+                    </td>
+                    <td class="width-15 active"><label class=""><font color="red">*</font>已出库数量：</label></td>
+                    <td class="width-35">
+                        <form:input path="outCount" htmlEscape="false" class="form-control required number"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="width-15 active"><label class=""><font color="red">*</font>可用库存数量：</label></td>
+                    <td class="width-35">
+                        <form:input path="availableStockQuantity" htmlEscape="false" class="form-control required number"/>
+                    </td>
+                </tr>
+		 	</tbody>
+		</table>
+	</form:form>
+</body>
+</html>