Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/entity/MaterialInfo.java

@@ -4,6 +4,7 @@ import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.core.persistence.DataEntity;
 
 public class MaterialInfo extends DataEntity<MaterialInfo> {
+    private String[] projectNames;//项目名称（多个）
     private String projectName;            //项目名称
     private String materialCode;           //物料编码
     private String materialName;         //物料名称
@@ -13,9 +14,44 @@ public class MaterialInfo extends DataEntity<MaterialInfo> {
     private Double weightKg;        //单重/kg
     private Double weightTon;      //总重/吨
     private String supplyType;   //甲乙供
+    //搜索条件
+    private String reserveCode;//储备编码
+    private String projectCode;//项目编码
+    private String projectDefine;//项目定义
     private String note;      //备注
     private String state;     //状态，与标准比对，1：相同 0：不相同
 
+    public String[] getProjectNames() {
+        return projectNames;
+    }
+
+    public void setProjectNames(String[] projectNames) {
+        this.projectNames = projectNames;
+    }
+
+    public String getReserveCode() {
+        return reserveCode;
+    }
+
+    public void setReserveCode(String reserveCode) {
+        this.reserveCode = reserveCode;
+    }
+
+    public String getProjectCode() {
+        return projectCode;
+    }
+
+    public void setProjectCode(String projectCode) {
+        this.projectCode = projectCode;
+    }
+
+    public String getProjectDefine() {
+        return projectDefine;
+    }
+
+    public void setProjectDefine(String projectDefine) {
+        this.projectDefine = projectDefine;
+    }
 
     public String getState() {
         return state;

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/mapper/xml/MaterialInfoMapper.xml

@@ -38,6 +38,12 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
+			<if test="projectNames != null ">
+				AND project_name in
+				<foreach collection="projectNames" index="index" item="item" open="(" separator="," close=")">
+					#{item}
+				</foreach>
+			</if>
 			<if test="projectName != null and projectName != '' ">
 				AND project_name LIKE CONCAT(CONCAT('%',#{projectName},'%'))
 			</if>

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/web/MaterialInfoController.java

@@ -82,6 +82,28 @@ public class MaterialInfoController extends BaseController {
 		@RequiresPermissions("managementcenter:materialinfo:list")
 		@RequestMapping(value = "data")
 		public Map<String, Object> data(MaterialInfo materialInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+			MaterialProject materialProject =  new MaterialProject();
+			materialProject.setProjectStatus("");
+			materialProject.setProjectCode(materialInfo.getProjectCode());
+			materialProject.setReserveCode(materialInfo.getReserveCode());
+			materialProject.setProjectDefine(materialInfo.getProjectDefine());
+			MaterialProject materialProject1 = new MaterialProject();
+			materialProjectService.getSearch(materialProject,materialProject1);
+			List<MaterialProject> list = materialProjectService.findList(materialProject);
+			String[] projectNames = new String[list.size()];
+			for (int i = 0; i < list.size(); i++) {
+				if (null!=list.get(i).getReserveProjectName()&&!"".equals(list.get(i).getReserveProjectName())){
+					projectNames[i] = list.get(i).getReserveProjectName();
+				}
+			}
+			if (null!=list&&list.size()>0){
+				materialInfo.setProjectNames(projectNames);
+			}else {
+				if (!"".equals(materialInfo.getReserveCode())||!"".equals(materialInfo.getProjectCode())||
+					!"".equals(materialInfo.getProjectDefine())){
+					materialInfo.setProjectName("没有找到:请重新刷新...");
+				}
+			}
 			Page<MaterialInfo> page = materialInfoService.findPage(new Page<MaterialInfo>(request, response), materialInfo);
 			return getBootstrapData(page);
 		}

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

@@ -1,14 +1,25 @@
 package com.jeeplus.modules.sg.managementcenter.materialplan.entity;
 
+import com.jeeplus.core.persistence.DataEntity;
+
 /**
  * 基础数据 -- 库存导入表
  */
-public class InventoryTable {
+public class InventoryTable extends DataEntity<InventoryTable> {
     private String uniqueCode;//物资唯一码（批次编码）
-    private String inventoryQuantity;//非限制库存数量
-    private String numberFrozen;//冻结数量
+    private Double inventoryQuantity;//非限制库存数量
+    private Double numberFrozen;//冻结数量
+    private String flagStorage;//是否入库
     private String supplierName;//供应商名称
 
+    public String getFlagStorage() {
+        return flagStorage;
+    }
+
+    public void setFlagStorage(String flagStorage) {
+        this.flagStorage = flagStorage;
+    }
+
     public String getUniqueCode() {
         return uniqueCode;
     }
@@ -17,19 +28,19 @@ public class InventoryTable {
         this.uniqueCode = uniqueCode;
     }
 
-    public String getInventoryQuantity() {
+    public Double getInventoryQuantity() {
         return inventoryQuantity;
     }
 
-    public void setInventoryQuantity(String inventoryQuantity) {
+    public void setInventoryQuantity(Double inventoryQuantity) {
         this.inventoryQuantity = inventoryQuantity;
     }
 
-    public String getNumberFrozen() {
+    public Double getNumberFrozen() {
         return numberFrozen;
     }
 
-    public void setNumberFrozen(String numberFrozen) {
+    public void setNumberFrozen(Double numberFrozen) {
         this.numberFrozen = numberFrozen;
     }
 
@@ -41,13 +52,4 @@ public class InventoryTable {
         this.supplierName = supplierName;
     }
 
-    @Override
-    public String toString() {
-        return "InventoryTable{" +
-                "uniqueCode='" + uniqueCode + '\'' +
-                ", inventoryQuantity='" + inventoryQuantity + '\'' +
-                ", numberFrozen='" + numberFrozen + '\'' +
-                ", supplierName='" + supplierName + '\'' +
-                '}';
-    }
 }

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

@@ -6,6 +6,7 @@ package com.jeeplus.modules.sg.managementcenter.materialplan.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
+import com.jeeplus.modules.sg.managementcenter.materialplan.entity.InventoryTable;
 import com.jeeplus.modules.sg.managementcenter.materialplan.entity.MaterialPlan;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import io.swagger.models.auth.In;
@@ -23,4 +24,5 @@ public interface MaterialPlanMapper extends BaseMapper<MaterialPlan> {
     public Integer insertList(@Param("list") List<MaterialPlan> list);
     void deleteData(String uniqueCode);
     void updateTime(MaterialPlan materialPlan);
+    void updateInventory(InventoryTable inventoryTable);
 }

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

@@ -210,6 +210,18 @@
 			supplier_name = #{supplierName}
 		WHERE unique_code = #{uniqueCode}
 	</update>
+
+	<update id="updateInventory">
+		UPDATE xm_material_plan SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			flag_storage = #{flagStorage},
+			inventory_quantity = #{inventoryQuantity},
+			number_frozen = #{numberFrozen},
+			supplier_name = #{supplierName}
+		WHERE unique_code = #{uniqueCode}
+	</update>
+
 	<update id="updateTime">
 		UPDATE xm_material_plan SET
 			update_by = #{updateBy.id},

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/service/MaterialPlanService.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.sg.managementcenter.materialplan.service;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
+import com.jeeplus.modules.sg.managementcenter.materialplan.entity.InventoryTable;
 import com.jeeplus.modules.sg.managementcenter.materialplan.entity.MaterialPlan;
 import com.jeeplus.modules.sg.managementcenter.materialplan.mapper.MaterialPlanMapper;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
@@ -68,11 +69,16 @@ public class MaterialPlanService extends CrudService<MaterialPlanMapper, Materia
 	public void deleteData(String uniqueCode){materialPlanMapper.deleteData(uniqueCode);
 	}
 
-	@Transactional
+	@Transactional(readOnly = false)
 	public void updateTime(MaterialPlan materialPlan){
 		materialPlan.preUpdate();
 		materialPlanMapper.updateTime(materialPlan);
 	}
+	@Transactional(readOnly = false)
+	public void updateInventory(InventoryTable inventoryTable){
+		inventoryTable.preUpdate();
+		materialPlanMapper.updateInventory(inventoryTable);
+	}
 
 	public void exportHeard( HttpServletResponse response){
 		InputStream inputStream = null;

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

@@ -1,4 +1,5 @@
 package com.jeeplus.modules.sg.managementcenter.materialplan.util;
+import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.modules.sg.managementcenter.materialplan.entity.InventoryTable;
 import com.jeeplus.modules.sg.managementcenter.materialplan.entity.MaterialPlan;
 import com.jeeplus.modules.sg.managementcenter.materialplan.entity.Storage;
@@ -15,7 +16,6 @@ public class MaterialPlanInfo {
     public static final Integer MATER_ONE = 1;
     public static final Integer MATER_TWO = 2;
     public static final Integer MATER_THREE = 3;
-    public static final Integer MATER_FOUR = 4;
     public static final String MATER_CODE = "物资唯一码";
     public static final String MATER_CODETWO = "批次编码";
     public static final String MATER_NUMBER = "序号";
@@ -59,15 +59,6 @@ public class MaterialPlanInfo {
                 }
                 materialPlan.setUtil((String)importUtil.getCellValue(row,9));
                 materialPlan.setPlanToBatch((String)importUtil.getCellValue(row,10));
-//                materialPlan.setFlagStorage((String)importUtil.getCellValue(row,12));
-//                inventoryQuantity = (String)importUtil.getCellValue(row,13);
-//                if (null!=inventoryQuantity&&!inventoryQuantity.equals("")){
-//                    materialPlan.setInventoryQuantity(new Double((String)importUtil.getCellValue(row,13)));
-//                }
-//                numberFrozen = (String)importUtil.getCellValue(row,14);
-//                if (null!=numberFrozen&&!inventoryQuantity.equals("")){
-//                    materialPlan.setNumberFrozen(new Double((String)importUtil.getCellValue(row,14)));
-//                }
 //                materialPlan.setSupplierName((String)importUtil.getCellValue(row,15));
                 list.add(materialPlan);
             }
@@ -91,8 +82,8 @@ public class MaterialPlanInfo {
             uniqueCode = (String)importUtil.getCellValue(row,3);
             if (StringUtils.isNotBlank(uniqueCode)){
                 inventoryTable.setUniqueCode(uniqueCode);
-                inventoryTable.setInventoryQuantity((String)importUtil.getCellValue(row,7));
-                inventoryTable.setNumberFrozen((String)importUtil.getCellValue(row,9));
+                inventoryTable.setInventoryQuantity(new Double((String)importUtil.getCellValue(row,7)));
+                inventoryTable.setNumberFrozen(new Double((String)importUtil.getCellValue(row,9)));
                 inventoryTable.setSupplierName((String)importUtil.getCellValue(row,15));
                 list.add(inventoryTable);
             }
@@ -101,26 +92,6 @@ public class MaterialPlanInfo {
     }
 
     /**
-     * 导入是否入库
-     */
-    public static List<Storage> getFlagStorage(ImportUtil importUtil)  {
-        int lastRow = importUtil.getLastDataRowNum();
-        List<Storage> list = new ArrayList<Storage>();
-        Storage storage = null;
-        String uniqueCode="";//费用估算
-        for(int i=1; i<lastRow;i++){
-            storage = new Storage();
-            Row row = importUtil.getRow(i);
-            uniqueCode = (String)importUtil.getCellValue(row,0);
-            if (StringUtils.isNotBlank(uniqueCode)){
-                storage.setUniqueCode(uniqueCode);
-                storage.setFlagStorage((String)importUtil.getCellValue(row,1));
-                list.add(storage);
-            }
-        }
-        return list;
-    }
-    /**
      * 判断excel是哪张表
      * @return
      */
@@ -134,68 +105,28 @@ public class MaterialPlanInfo {
            if (basicTwoName.contains(MATER_MATERIAL)){
                return MATER_ONE;
            }
-            if (twoName.contains(MATER_FLAG)){
-                return MATER_THREE;
-            }
         }
         if (firstName.contains(MATER_NUMBER)&&fourName.contains(MATER_MATERIAL)){
             return MATER_TWO;
         }
-        return MATER_FOUR;
-    }
-
-    /**
-     * 判断是否入库符合规范
-     * @param importUtil
-     * @return
-     */
-    public static boolean getJudeStorage(ImportUtil importUtil){
-        boolean flag = false;
-        List<Storage> flagStorage = MaterialPlanInfo.getFlagStorage(importUtil);
-        if (null!=flagStorage&&flagStorage.size()>0){
-            for (Storage storage:flagStorage){
-                if (!storage.getFlagStorage().equals(MATER_YES)&&!storage.getFlagStorage().equals(MATER_NO)){
-                    flag = true;
-                    break;
-                }
-            }
-        }
-        return flag;
-    }
-    /**
-     * 获取库存数据
-     * @return
-     */
-    public static List<MaterialPlan> getUpdateMaterPlan(List<MaterialPlan> materialPlanList,ImportUtil importUtil){
-        List<InventoryTable> inventoryTableList = MaterialPlanInfo.getInventoryTableUtil(importUtil);
-        for (MaterialPlan materialPlan:materialPlanList){
-            for (InventoryTable inventoryTable:inventoryTableList){
-                if (materialPlan.getUniqueCode().equals(inventoryTable.getUniqueCode())){
-                    materialPlan.setInventoryQuantity(new Double(inventoryTable.getInventoryQuantity()));
-                    materialPlan.setNumberFrozen(new Double(inventoryTable.getNumberFrozen()));
-                    materialPlan.setSupplierName(inventoryTable.getSupplierName());
-                }
-            }
-        }
-        return materialPlanList;
+        return MATER_THREE;
     }
 
     /**
      * 获取是否入库数据
-     * @param materialPlanList
      * @param importUtil
      * @return
      */
-    public static List<MaterialPlan> getUpdateMaterPlanStorage(List<MaterialPlan> materialPlanList,ImportUtil importUtil){
-        List<Storage> flagStorage = MaterialPlanInfo.getFlagStorage(importUtil);
-        for (MaterialPlan materialPlan:materialPlanList){
-            for (Storage storage:flagStorage){
-                if (materialPlan.getUniqueCode().equals(storage.getUniqueCode())){
-                    materialPlan.setFlagStorage(storage.getFlagStorage());
-                }
+    public static List<InventoryTable> getUpdateMaterPlan(ImportUtil importUtil){
+        List<InventoryTable> inventoryTableList = MaterialPlanInfo.getInventoryTableUtil(importUtil);
+        for (InventoryTable inventoryTable:inventoryTableList){
+            if (inventoryTable.getInventoryQuantity()+inventoryTable.getNumberFrozen()>0){
+                inventoryTable.setFlagStorage("是");
+            }else {
+                inventoryTable.setFlagStorage("否");
             }
         }
-        return materialPlanList;
+        return inventoryTableList;
     }
     /**
      * 生成随机数
@@ -209,5 +140,4 @@ public class MaterialPlanInfo {
         }
         return  (machineId+String.format("%015d",hashCodeV));
     }
-
 }

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

@@ -189,9 +189,9 @@ public class MeterialPlanController extends BaseController {
 			StringBuilder failureMsg = new StringBuilder();
 			ImportUtil importUtil = new ImportUtil(file,0,0);
 			Integer integer = MaterialPlanInfo.getJudgeExcel(importUtil);//验证表
-			if (integer==MaterialPlanInfo.MATER_FOUR){
+			if (integer==MaterialPlanInfo.MATER_THREE){
 				j.setSuccess(false);
-				j.setMsg("表不符合规范，请重新导入");
+				j.setMsg("导入失败：表不符合规范，请重新导入");
 				return j;
 			}
 			if (integer==MaterialPlanInfo.MATER_ONE){
@@ -209,30 +209,10 @@ public class MeterialPlanController extends BaseController {
 					j.setMsg("您还没有导入基本信息表");
 					return j;
 				}
-				List<MaterialPlan> updateMaterPlans = MaterialPlanInfo.getUpdateMaterPlan(materialPlanList, importUtil);
-				for (MaterialPlan updateMaterPlan:updateMaterPlans){
+				List<InventoryTable> inventoryTables = MaterialPlanInfo.getUpdateMaterPlan(importUtil);
+				for (InventoryTable inventoryTable:inventoryTables){
 					try{
-						materialPlanService.update(updateMaterPlan);
-						successNum++;
-					}catch(ConstraintViolationException ex){
-						failureNum++;
-					}catch (Exception ex) {
-						failureNum++;
-					}
-				}
-			}
-			if (integer == MaterialPlanInfo.MATER_THREE){
-
-				boolean judeStorage = MaterialPlanInfo.getJudeStorage(importUtil);
-				if (judeStorage){
-					j.setSuccess(false);
-					j.setMsg( "是否入库表不符合规范");
-					return j;
-				}
-				List<MaterialPlan> updateMaterPlanStorage = MaterialPlanInfo.getUpdateMaterPlanStorage(materialPlanList, importUtil);
-				for (MaterialPlan updateStorage:updateMaterPlanStorage){
-					try{
-						materialPlanService.update(updateStorage);
+						materialPlanService.updateInventory(inventoryTable);
 						successNum++;
 					}catch(ConstraintViolationException ex){
 						failureNum++;
@@ -248,10 +228,7 @@ public class MeterialPlanController extends BaseController {
 				j.setMsg( "已成功导入 "+count+" 条基本表记录"+failureMsg);
 			}
 			if (integer == MaterialPlanInfo.MATER_TWO){
-				j.setMsg( "已成功导入库存表记录");
-			}
-			if (integer == MaterialPlanInfo.MATER_THREE){
-				j.setMsg( "已成功导入条是否入库记录");
+				j.setMsg( "已成功导入"+successNum+"库存表记录");
 			}
 		} catch (Exception e) {
 			j.setSuccess(false);

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

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.modules.sg.managementcenter.materialproject.service;
 
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.service.MaterialInfoService;
@@ -69,4 +70,70 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 		}
 		materialProjectMapper.replaceList(list);
 	}
+	public void getSearch(MaterialProject materialProject,MaterialProject materialProject1){
+		String reserveCode = materialProject.getReserveCode();
+		String projectCode = materialProject.getProjectCode();
+		if (StringUtils.isNotBlank(reserveCode)){
+			String[] reserveCodes= reserveCode.split("\\s+");
+			if(reserveCodes.length == 1){
+				materialProject.setReserveCode(reserveCodes[0]);
+			}else {
+				materialProject.setReserveCodes(reserveCodes);
+				materialProject.setReserveCode("");
+			}
+		}
+		if (StringUtils.isNotBlank(projectCode)){
+			String[] projectCodes = projectCode.split("\\s+");
+			if(projectCodes.length == 1){
+				materialProject.setProjectCode(projectCodes[0]);
+			}else {
+				materialProject.setProjectCodes(projectCodes);
+				materialProject.setProjectCode("");
+			}
+		}
+		materialProject1.setProjectStatus("");
+		materialProject1.setReserveProjectName(materialProject.getReserveProjectName());
+		materialProject1.setProjectName(materialProject.getProjectName());
+		materialProject1.setProjectCode(materialProject.getProjectCode());
+		materialProject1.setReserveCode(materialProject.getReserveCode());
+		materialProject1.setProjectAttribute(materialProject.getProjectAttribute());
+		materialProject1.setProjectDefine(materialProject.getProjectDefine());
+		materialProject1.setProjectBatch(materialProject.getProjectBatch());
+		materialProject1.setReserveCodes(materialProject.getReserveCodes());
+		materialProject1.setProjectCodes(materialProject.getProjectCodes());
+		String strProject = "";
+		if (null!=materialProject.getReserveProjectName()&&!materialProject.getReserveProjectName().equals("")){
+			strProject+=materialProject.getReserveProjectName()+",";
+		}
+		if (null!=materialProject.getProjectName()&&!materialProject.getProjectName().equals("")){
+			strProject+=materialProject.getReserveProjectName()+",";
+		}
+		if (null!=materialProject.getProjectCode()&&!materialProject.getProjectCode().equals("")){
+			strProject+=materialProject.getProjectCode()+",";
+		}
+		if (null!=materialProject.getReserveCode()&&!materialProject.getReserveCode().equals("")){
+			strProject+=materialProject.getReserveCode()+",";
+		}
+		if (null!=materialProject.getProjectAttribute()&&!materialProject.getProjectAttribute().equals("")){
+			strProject+=materialProject.getProjectAttribute()+",";
+		}
+		if (null!=materialProject.getProjectDefine()&&!materialProject.getProjectDefine().equals("")){
+			strProject+=materialProject.getProjectDefine()+",";
+		}
+		if (null!=materialProject.getProjectBatch()&&!materialProject.getProjectBatch().equals("")){
+			strProject+=materialProject.getProjectBatch()+",";
+		}
+		if (null!=materialProject.getProjectCodes()){
+			strProject+=materialProject.getProjectCodes();
+		}
+		if (null!=materialProject.getReserveCodes()){
+			strProject+=materialProject.getReserveCodes();
+		}
+		String[] split = strProject.split(",");
+		if (split.length>1){
+			materialProject.setProjectStatus("0");
+			materialProject1.setProjectStatus("0");
+		}
+	}
+
 }

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

@@ -80,7 +80,7 @@ public class MaterialProjectController extends BaseController {
 	public Map<String, Object> data(MaterialProject materialProject, HttpServletRequest request, HttpServletResponse response, Model model) {
 		materialProject.setProjectStatus("");
 		MaterialProject materialProject1 = new MaterialProject();
-		getSearch(materialProject,materialProject1);
+		materialProjectService.getSearch(materialProject,materialProject1);
 		HttpSession session = request.getSession();
 		session.setAttribute("materialPro",materialProject1);
 		Page<MaterialProject> page = materialProjectService.findPage(new Page<MaterialProject>(request, response), materialProject);
@@ -172,7 +172,6 @@ public class MaterialProjectController extends BaseController {
 			}else {
 				list = materialProjectService.findList(materialProject);
 			}
-//            List<MaterialProject> list = materialProjectService.findList(materialProject);
             List<MaterialInfo> materialInfos = materialInfoService.findByBatch(list);
     		new ExportExcel(null, MaterialInfo.class).setDataList(materialInfos).write(response, fileName).dispose();
     		j.setSuccess(true);
@@ -247,71 +246,4 @@ public class MaterialProjectController extends BaseController {
 		}
 		return j;
 	}
-	
-	public void getSearch(MaterialProject materialProject,MaterialProject materialProject1){
-		String reserveCode = materialProject.getReserveCode();
-		String projectCode = materialProject.getProjectCode();
-		if (StringUtils.isNotBlank(reserveCode)){
-			String[] reserveCodes= reserveCode.split("\\s+");
-			if(reserveCodes.length == 1){
-				materialProject.setReserveCode(reserveCodes[0]);
-			}else {
-				materialProject.setReserveCodes(reserveCodes);
-				materialProject.setReserveCode("");
-			}
-		}
-		if (StringUtils.isNotBlank(projectCode)){
-			String[] projectCodes = projectCode.split("\\s+");
-			if(projectCodes.length == 1){
-				materialProject.setProjectCode(projectCodes[0]);
-			}else {
-				materialProject.setProjectCodes(projectCodes);
-				materialProject.setProjectCode("");
-			}
-		}
-		materialProject1.setProjectStatus("");
-		materialProject1.setReserveProjectName(materialProject.getReserveProjectName());
-		materialProject1.setProjectName(materialProject.getProjectName());
-		materialProject1.setProjectCode(materialProject.getProjectCode());
-		materialProject1.setReserveCode(materialProject.getReserveCode());
-		materialProject1.setProjectAttribute(materialProject.getProjectAttribute());
-		materialProject1.setProjectDefine(materialProject.getProjectDefine());
-		materialProject1.setProjectBatch(materialProject.getProjectBatch());
-		materialProject1.setReserveCodes(materialProject.getReserveCodes());
-		materialProject1.setProjectCodes(materialProject.getProjectCodes());
-		String strProject = "";
-		if (!materialProject.getReserveProjectName().equals("")){
-			strProject+=materialProject.getReserveProjectName()+",";
-		}
-		if (!materialProject.getProjectName().equals("")){
-			strProject+=materialProject.getReserveProjectName()+",";
-		}
-		if (!materialProject.getProjectCode().equals("")){
-			strProject+=materialProject.getProjectCode()+",";
-		}
-		if (!materialProject.getReserveCode().equals("")){
-			strProject+=materialProject.getReserveCode()+",";
-		}
-		if (!materialProject.getProjectAttribute().equals("")){
-			strProject+=materialProject.getProjectAttribute()+",";
-		}
-		if (!materialProject.getProjectDefine().equals("")){
-			strProject+=materialProject.getProjectDefine()+",";
-		}
-		if (!materialProject.getProjectBatch().equals("")){
-			strProject+=materialProject.getProjectBatch()+",";
-		}
-		if (null!=materialProject.getProjectCodes()){
-			strProject+=materialProject.getProjectCodes();
-		}
-		if (null!=materialProject.getReserveCodes()){
-			strProject+=materialProject.getReserveCodes();
-		}
-		String[] split = strProject.split(",");
-		if (split.length>1){
-			materialProject.setProjectStatus("0");
-			materialProject1.setProjectStatus("0");
-		}
-	}
-
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -264,9 +264,9 @@ public class ProjectController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("sg:managementcenter:project:import")
     @RequestMapping(value = "import")
-   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws Exception{
+   	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request){
 		AjaxJson j = new AjaxJson();
-//		try {
+		try {
 			ImportUtil importUtil = new ImportUtil(file, 0, 0);
 			Boolean projectUtilFlag = ProExcelInfo.getProjectUtilFlag(importUtil);
 			if (projectUtilFlag){
@@ -283,10 +283,10 @@ public class ProjectController extends BaseController {
 			}
 			projectService.saveList(projects);
 			j.setMsg( "已成功导入 "+projects.size()+" 条项目表单记录");
-//		} catch (Exception e) {
-//			j.setSuccess(false);
-//			j.setMsg("导入需求基本信息表单失败！失败信息："+e.getMessage());
-//		}
+		} catch (Exception e) {
+			j.setSuccess(false);
+			j.setMsg("导入需求基本信息表单失败！失败信息："+e.getMessage());
+		}
 		return j;
     }
 }

src/main/webapp/webpage/modules/sg/managementcenter/materialinfo/materialInfoList.jsp

@@ -25,6 +25,18 @@
 					<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
 					<form:input path="projectName" 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="reserveCode" 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="projectCode" 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="projectDefine" 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>

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

@@ -79,9 +79,9 @@
 				<button id="export" class="btn btn-warning">
 					<i class="fa fa-file-excel-o"></i> 导出
 				</button>
-				<button id="export1" class="btn btn-warning">
-					<i class="fa fa-file-excel-o"></i> 入库模板下载
-				</button>
+				<%--<button id="export1" class="btn btn-warning">--%>
+					<%--<i class="fa fa-file-excel-o"></i> 入库模板下载--%>
+				<%--</button>--%>
 			</shiro:hasPermission>
 		    </div>
 	<!-- 表格 -->