领料模块发起，填写数据，领导审核功能

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

@@ -17,6 +17,8 @@ public class PickIng extends DataEntity<PickIng> {
     private String mdSmallClass;
     //单位
     private String mdUnit;
+    //版本
+    private String version;
 
     @Override
     public String getId() {
@@ -54,4 +56,12 @@ public class PickIng extends DataEntity<PickIng> {
     public void setMdUnit(String mdUnit) {
         this.mdUnit = mdUnit;
     }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
 }

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

@@ -27,4 +27,6 @@ public interface PickIngMapper extends BaseMapper<PickIng> {
     void updateSelectNumber(@Param("selectNumber") String selectNumber,@Param("procInsId") String procInsId);
 
     String findSelectNumber(String procInsId);
+
+    String selectVersion(String procInsId);
 }

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

@@ -33,7 +33,7 @@
     <select id="findAllList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.PickIng">
         SELECT
         <include refid="classColumns"/>
-        FROM md_module_block a order by md_big_sort,md_the_sort,md_small_sort
+        FROM md_module_block a where md_version = #{version} order by md_big_sort,md_the_sort,md_small_sort
     </select>
 
     <insert id="insert">
@@ -106,4 +106,7 @@
 		select select_number from md_acquisition_process where proc_ins_id=#{procInsId};
 	</select>
 
+	<select id="selectVersion" resultType="string">
+		select version from md_acquisition_process where proc_ins_id = #{pprocInsId};
+	</select>
 </mapper>

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

@@ -40,7 +40,8 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 	 * 去除重复，记录大类
 	 * 根据大类查询它的中类放入list并记录
 	 * */
-	public List<PickList> newAllList(PickIng entity) {
+	public List<PickList> newAllList(PickIng entity,String s) {
+		entity.setVersion(s);
 		//查询除所有数据
 		List<PickIng> allList = pickIngMapper.findAllList(entity);
 		//创建返回对象集合
@@ -125,4 +126,8 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 	public String findSelectNumber(String procInsId) {
 		return pickIngMapper.findSelectNumber(procInsId);
 	}
+
+	public String selectVersion(String procInsId) {
+		return pickIngMapper.selectVersion(procInsId);
+	}
 }

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

@@ -48,8 +48,10 @@ public class PickIngController extends BaseController {
      */
     @RequestMapping(value = "list")
     public String form(ShowList showList, Model model) {
+        String procInsId = showList.getAct().getProcInsId();
+        String s = pickIngService.selectVersion(procInsId);
         PickIng pickIng = new PickIng();
-        List<PickList> pickListList = pickIngService.newAllList(pickIng);
+        List<PickList> pickListList = pickIngService.newAllList(pickIng,s);
         model.addAttribute("showList",showList);
         model.addAttribute("pickListList", pickListList);
         return "modules/sg/picking/activiti/pickIng";
@@ -180,7 +182,7 @@ public class PickIngController extends BaseController {
     }
 
     /**
-     * 保存请假申请
+     * 保存申请
      */
     @ResponseBody
     @RequestMapping(value = "save")