Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/PickingRequisitionMapper.java

@@ -17,10 +17,10 @@ import java.util.List;
 @MyBatisMapper
 public interface PickingRequisitionMapper extends BaseMapper<PickingRequisition> {
     int insertList(@Param("list") List<PickingRequisition> list);
-    List<PickingRequisition> findListPicking(List<PickingRequisition> pickingRequisitions);
+    List<PickingRequisition> findListPicking(List<PickingRequisition> pickingReqisitions);
 
     //查找登录名id
     List<String> findUserId(@Param("list") List<String> list);
 
-    List<Acquisition> findListAcquisition(@Param("list")List<Project> projects);
+    List<Acquisition> findListAcquisition(@Param("list")List<Project> list);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/ProjectMapper.java

@@ -23,6 +23,8 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     void  updateStatusByClose(@Param("close") String close,@Param("procInsId") String procInsid);
 
+    void updateAcquisitionStatus(@Param("acquisitionStatus")String acquisitionStatus,@Param("id") String id);
+
     public List<Project> findListById(String[] proListId);
 
     int insertList(@Param("list") List<Project> list);
@@ -34,6 +36,6 @@ public interface ProjectMapper extends BaseMapper<Project> {
     Integer updatePreConstruction(Project project);
 
     //查找项目信息
-    List<Project> findListProjectRequisitions(@Param("list")List<PickingRequisition> pickingRequisitions);
+    List<Project> findListProjectRequisitions(@Param("list") List<PickingRequisition> list);
 
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/PickingRequisitionMapper.xml

@@ -10,35 +10,8 @@
 		a.update_date AS "updateDate",
 		a.remarks AS "remarks",
 		a.del_flag AS "delFlag",
-		a.lineItemNumber AS lineItemNumber,
 		a.requisition AS requisition,
-		a.userName AS userName,
-		a.fullName AS fullName,
-		a.itemDetail AS itemDetail,
-		a.theFactory AS theFactory,
-		a.reservedNumberr AS reservedNumberr,
-		a.reserveLineNumber AS reserveLineNumber,
-		a.projectDefinition AS projectDefinition,
-		a.wbsElement AS wbsElement,
-		a.materialCode AS materialCode,
-		a.materialDescription AS materialDescription,
-		a.measuringUnit AS measuringUnit,
-		a.quantityDemanded AS quantityDemanded,
-		a.quantityDelivered AS quantityDelivered,
-		a.changeData AS changeData,
-		a.requisitionCostCenter AS requisitionCostCenter,
-		a.factoryDescription AS factoryDescription,
-		a.projectDepartment AS projectDepartment,
-		a.batch AS batch,
-		a.planningDivision AS planningDivision,
-		a.theOrder AS theOrder,
-		a.wbsDescription AS wbsDescription,
-		a.purposeMark AS purposeMark,
-		a.specialStock AS specialStock,
-		a.appointmentDate AS appointmentDate,
-		a.purposeIdentification AS purposeIdentification,
-		a.returnId AS returnId,
-		a.returnMessage AS returnMessage
+		a.projectDefinition AS projectDefinition
 	</sql>
     
 	<select id="get" resultType="PickingRequisition" >
@@ -171,35 +144,8 @@
 		update_date,
 		remarks,
 		del_flag,
-		lineItemNumber,
 		requisition,
-		userName,
-		fullName,
-		itemDetail,
-		theFactory,
-		reservedNumberr,
-		reserveLineNumber,
-		projectDefinition,
-		wbsElement,
-		materialCode,
-		materialDescription,
-		measuringUnit,
-		quantityDemanded,
-		quantityDelivered,
-		changeData,
-		requisitionCostCenter,
-		factoryDescription,
-		projectDepartment,
-		batch,
-		planningDivision,
-		theOrder,
-		wbsDescription,
-		purposeMark,
-		specialStock,
-		appointmentDate,
-		purposeIdentification,
-		returnId,
-		returnMessage
+		projectDefinition
 		) VALUES
 		<foreach collection="list" item="item" index="index" separator="," >
 			(
@@ -210,35 +156,8 @@
 			#{item.updateDate},
 			#{item.remarks},
 			#{item.delFlag},
-			#{item.lineItemNumber},
 			#{item.requisition},
-			#{item.userName},
-			#{item.fullName},
-			#{item.itemDetail},
-			#{item.theFactory},
-			#{item.reservedNumberr},
-			#{item.reserveLineNumber},
-			#{item.projectDefinition},
-			#{item.wbsElement},
-			#{item.materialCode},
-			#{item.materialDescription},
-			#{item.measuringUnit},
-			#{item.quantityDemanded},
-			#{item.quantityDelivered},
-			#{item.changeData},
-			#{item.requisitionCostCenter},
-			#{item.factoryDescription},
-			#{item.projectDepartment},
-			#{item.batch},
-			#{item.planningDivision},
-			#{item.theOrder},
-			#{item.wbsDescription},
-			#{item.purposeMark},
-			#{item.specialStock},
-			#{item.appointmentDate},
-			#{item.purposeIdentification},
-			#{item.returnId},
-			#{item.returnMessage}
+			#{item.projectDefinition}
 		)
 		</foreach>
 	</insert>
@@ -297,11 +216,8 @@
 	<select id="findListAcquisition" parameterType="java.util.List" resultType="com.jeeplus.modules.sg.picking.activiti.entity.Acquisition">
 		select
 		a.id AS "id",
-		a.md_img AS "mdImg",
-		a.md_big_class AS "mdBigClass",
-		a.md_the_class AS "mdTheClass",
-		a.md_small_class AS "mdSmallClass",
-		a.md_unit AS "mdUnit"
+		a.project_id  AS "projectId",
+		a.managerTime AS "managerTime"
 		FROM md_acquisition_process a
 		WHERE a.del_flag = '0'
 		and a.project_id in

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -511,6 +511,11 @@
 		update xm_project_details set status = #{status} where id = #{id};
 	</update>
 
+	<!--修改项目领料状态状态0未发起-->
+	<update id="updateAcquisitionStatus">
+		update xm_project_details set status = #{acquisitionStatus} where id = #{id};
+	</update>
+
 	<!--修改提前施工状态0未提前施工，1提前施工-->
 	<update id="updatePreConstruction">
 		update xm_project_details set preConstruction = #{preConstruction} where id = #{id};
@@ -569,7 +574,7 @@
 		<include refid="projectColumns"/>
 		FROM xm_project_details a
 		WHERE a.del_flag = '0'
-		and a.projectNumber in
+		and a.project_number in
 		<if test="list != null">
 			<foreach collection="list" index="index" item="item" open="("
 					 separator="," close=")">

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -306,4 +306,8 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	public List<Project> findListProjectPicking(List<PickingRequisition> pickingRequisitions){
 		return projectMapper.findListProjectRequisitions(pickingRequisitions);
 	}
+	//修改领料状态
+	public void getUpdateAcquisitionStatus(String acquisitionStatus,String id){
+		projectMapper.updateAcquisitionStatus(acquisitionStatus,id);
+	}
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/PickingInfo.java

@@ -14,10 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Row;
 
 import javax.servlet.ServletContext;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 public  class PickingInfo {
     public final static String[] ALL_USER_ID={"项目经理","配网工程专职","配网政策处理专职","配网物资专职","项目管理中心领导","配网系统专职","配网运行人员","经研所","施工单位A","施工单位B","设计单位A","设计单位B"};
@@ -100,15 +97,19 @@ public  class PickingInfo {
         ArrayList<PickingRequisition> pickingDuplicates = new ArrayList<PickingRequisition>();
         boolean flag = true;//去重开关：判断是否存在重复
         PickingRequisition requisition = null;
+        String requisitionPicking = null;
         for (PickingRequisition pickingRequisition:pickingRequisitions){
             flag = true;
             for (PickingRequisition pickingDuplicate:pickingDuplicates){
                 if (pickingRequisition.getProjectDefinition().equals(pickingDuplicate.getProjectDefinition())) {
+                    requisitionPicking = pickingDuplicate.getRequisition()+","+pickingRequisition.getRequisition();
+                    pickingDuplicate.setRequisition(requisitionPicking);
                     flag = false;
                 }
             }
             if (flag){
                 requisition = new PickingRequisition();
+                requisition.setRequisition(pickingRequisition.getRequisition());
                 requisition.setProjectDefinition(pickingRequisition.getProjectDefinition());
                 pickingDuplicates.add(requisition);
             }
@@ -123,23 +124,86 @@ public  class PickingInfo {
      * @return 确定保存到数据库中数据
      */
     public static List<PickingRequisition> getSureSavePicking(List<PickingRequisition> pickingRequisitions,List<PickingRequisition> listPickingRequisition){
-        if (null==pickingRequisitions||pickingRequisitions.size()<=0){
-            return listPickingRequisition;
+//        if (null==pickingRequisitions||pickingRequisitions.size()<=0){
+//            return listPickingRequisition;
+//        }
+        ArrayList<PickingRequisition> arrayList = new ArrayList<PickingRequisition>();
+        for (PickingRequisition pickingRequisition:listPickingRequisition){
+            arrayList.add(pickingRequisition);
         }
         String projectDefinition = "";//项目定义号
-        for (int i = 0; i < listPickingRequisition.size(); i++) {
-            projectDefinition = listPickingRequisition.get(i).getProjectDefinition();
-            for (PickingRequisition pickingRequisition:pickingRequisitions){
-                if (pickingRequisition.equals(pickingRequisition.getProjectDefinition())){
-                    listPickingRequisition.remove(i);
-                    i--;
-                    break;
+        String requisition = "";//领料单号
+        String requisitionPicking = "";//表格中领料单号
+        boolean flag = false;
+        boolean flag1 = false;
+        for (PickingRequisition pickingRequisition:arrayList){
+            flag = false;
+            flag1 = false;
+            requisitionPicking = pickingRequisition.getRequisition();//领料单号
+            for (PickingRequisition pickingRequisition1:pickingRequisitions){
+                if (pickingRequisition.getProjectDefinition().equals(pickingRequisition1.getProjectDefinition())){
+                    requisition = pickingRequisition1.getRequisition();
+                    if (requisition.length()>0){
+                        String[] split = requisition.split(",");
+                        for (String str:split){
+                            if (requisitionPicking.equals(str)){
+                                flag1= true;
+                            }
+                        }
+                    }
+                    flag = true;
+                }
+            }
+            if (flag){
+                if (!flag1){
+                    requisition=requisition+","+requisitionPicking;
+                    pickingRequisition.setRequisition(requisition);
                 }
             }
+            String strings = oneClear(pickingRequisition.getRequisition());//领料单号去重
+            if (!"".equals(strings)){
+                pickingRequisition.setRequisition(strings);
+            }
+        }
+        return arrayList;
+    }
+
+    public static String oneClear(String requisitionPicking){
+        if (requisitionPicking.length()>0){
+            String string = "";
+            String[] split = requisitionPicking.split(",");
+            Set<String> set = new HashSet<String>();
+            for(int i=0;i<split.length;i++) {
+                set.add(split[i]);
+            }
+            for (String str :set){
+                string+=str+",";
+            }
+            if (!"".equals(string)){
+                string = string.substring(0,string.length()-1);
+                return string;
+            }
+
+        }
+        return "";
+    }
+    /*
+        领料单号
+     */
+    public static  List<PickingRequisition> getChangePicking(List<PickingRequisition> pickingRequisitions){
+        List<PickingRequisition> pickingRequisitionList = getJudgePicking(pickingRequisitions);//获取是否领料状态
+        List<PickingRequisition> pickingRequisitionList1 = new ArrayList<PickingRequisition>();
+        Integer status = 0;
+        for (PickingRequisition pickingRequisition:pickingRequisitionList){
+            status = pickingRequisition.getStatus();//获取是否允许领料状态
+            if (status<=0){//如果状态大于0.说明 一致。
+                pickingRequisitionList1.add(pickingRequisition);
+            }
         }
-        return listPickingRequisition;
+        return pickingRequisitionList1;
     }
 
+
     /*
         返回单独项目定义号的  领料状态
      */
@@ -234,13 +298,15 @@ public  class PickingInfo {
         ProjectAcquisition projectAcquisition = null;
         for (Project project:listProjectPicking){
             for (Acquisition acquisition:findListDate){
-                if (project.getId().equals(acquisition.getId())){
-                    projectAcquisition = new ProjectAcquisition();
-                    projectAcquisition.setId(acquisition.getId());
-                    projectAcquisition.setProjectNumber(project.getProjectNumber());
-                    projectAcquisition.setAuditTime(acquisition.getManagerTime());
-                    projectAcquisitions.add(projectAcquisition);
-                    break;
+                if (project.getId().equals(acquisition.getProjectId())){
+                   if (null!=acquisition.getManagerTime()&&!"".equals(acquisition.getManagerTime())){
+                       projectAcquisition = new ProjectAcquisition();
+                       projectAcquisition.setId(acquisition.getId());
+                       projectAcquisition.setProjectNumber(project.getProjectNumber());
+                       projectAcquisition.setAuditTime(acquisition.getManagerTime());
+                       projectAcquisitions.add(projectAcquisition);
+                       break;
+                   }
                 }
             }
         }
@@ -263,11 +329,15 @@ public  class PickingInfo {
      */
     public static List<PickingRequisition> getListSameSetOf(List<ProjectAcquisition> listProjectAcquisition,List<PickingRequisition> listPickRequisition){
         List<PickingRequisition> pickingRequisitions = new ArrayList<PickingRequisition>();
+        Integer judgeDate = 0;
         for (PickingRequisition pickingRequisition:listPickRequisition){
             for (ProjectAcquisition projectAcquisition:listProjectAcquisition){
                 if (pickingRequisition.getProjectDefinition().equals(projectAcquisition.getProjectNumber())){
-                    pickingRequisition.setFlagMoreThree(getJudgeDate(projectAcquisition));//得到超过三天的标识
-                    pickingRequisitions.add(pickingRequisition);
+                    judgeDate = getJudgeDate(projectAcquisition);
+                    pickingRequisition.setFlagMoreThree(judgeDate);//得到超过三天的标识
+                    if (judgeDate==1){
+                        pickingRequisitions.add(pickingRequisition);
+                    }
                     break;
                 }
             }
@@ -291,10 +361,15 @@ public  class PickingInfo {
                 if (materialInventory.getMaterialCode().equals(pickingRequisition.getMaterialCode())){
                     pickingRequisition.setStockNumber(materialInventory.getStockQuantity());//得到非限制性库存数量
                     minus = pickingRequisition.getQuantityDemanded()-pickingRequisition.getQuantityDelivered();
+                    if (minus<0){
+                        minus=0-minus;
+                    }
                     stock = stock - minus;//得到最新的库存数量：非限制性库存数量-（需求数量-已出库数量）<0缺货
                     if (stock<0){//缺货
                         pickingRequisition.setWhetherStock(1.0);//缺货数量
                         stock = 0.0;
+                    }else {
+                        pickingRequisition.setWhetherStock(0.0);//未缺货
                     }
                     pickingRequisitionList.add(pickingRequisition);
                 }
@@ -344,10 +419,12 @@ public  class PickingInfo {
         String yesStock1 = "";
         List<PickingRequisition> duplicateRemoval2 = getDuplicateRemoval2(pickingRequisitions);
         for (PickingRequisition pickingRequisition:duplicateRemoval2){
-            yesStock1+="【物料："+pickingRequisition.getMaterialCode()
-                    +";物料描述:"+pickingRequisition.getMaterialDescription()+";计量单位:"+pickingRequisition.getMeasuringUnit()
-                    +";需求数量:"+pickingRequisition.getQuantityDemanded()+";已出库数量:"+pickingRequisition.getQuantityDelivered()
-                    +";非限制性库存数量:"+pickingRequisition.getStockNumber()+"】\n";
+            if (pickingRequisition.getWhetherStock()==1.0){
+                yesStock1+="【物料："+pickingRequisition.getMaterialCode()
+                        +";物料描述:"+pickingRequisition.getMaterialDescription()+";计量单位:"+pickingRequisition.getMeasuringUnit()
+                        +";需求数量:"+pickingRequisition.getQuantityDemanded()+";已出库数量:"+pickingRequisition.getQuantityDelivered()
+                        +";非限制性库存数量:"+pickingRequisition.getStockNumber()+"】\n";
+            }
         }
         return yesStock1;
     }
@@ -397,8 +474,8 @@ public  class PickingInfo {
      */
     public static Integer getJudgeDate(ProjectAcquisition projectAcquisition){
         Date date1 = new Date(System.currentTimeMillis());//获取系统时间
-        long days = date1.getTime() - projectAcquisition.getAuditTime().getTime()/1000/3600/24;
-        if (days>=72){
+        long days = (date1.getTime() - projectAcquisition.getAuditTime().getTime())/1000/3600/24;
+        if (days>=3){
             return 1;
         }
         return 0;

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

@@ -381,11 +381,12 @@ public class ProjectController extends BaseController {
 		领料单
 	 */
 	@ResponseBody
-	@RequiresPermissions("sg:managementcenter:project:import")
+	@RequiresPermissions("sg:managementcenter:project:importPicking")
 	@RequestMapping(value = "importPicking")
-	public AjaxJson importFileRequisition(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
+	public AjaxJson importFileRequisition(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request){
 		AjaxJson j = new AjaxJson();
-//		try {
+		String str = "";//提示
+		try {
 			ImportUtil importUtil = new ImportUtil(file, 0, 0);
 			//读取表格list
 			List<PickingRequisition> listPickRequisition = PickingInfo.getListPickRequisition(importUtil);
@@ -393,110 +394,140 @@ public class ProjectController extends BaseController {
 				如下3个list是导入操作（得到最终保存数据库的集合）。对领料单进行数据库保存。
 			 */
 			List<PickingRequisition> duplicateRemoval = PickingInfo.getDuplicateRemoval(listPickRequisition);//去重集合
+			if (null==duplicateRemoval || duplicateRemoval.size()<=0){
+				j.setSuccess(false);
+				j.setMsg("导入失败：导入表格无数据");
+				return j;
+			}
 			List<PickingRequisition> pickingRequisitions = pickingRequisitionService.pickingRequisitions(duplicateRemoval);//得到数据库中数据
-			List<PickingRequisition> sureSavePicking = PickingInfo.getSureSavePicking(pickingRequisitions, listPickRequisition);//参数1：得到数据库集合 参数2：读取表格list
+			List<PickingRequisition> sureSavePicking = PickingInfo.getSureSavePicking(pickingRequisitions, duplicateRemoval);//参数1：得到数据库集合 参数2：读取表格list
 			if (null!=sureSavePicking&&sureSavePicking.size()>0){
 				pickingRequisitionService.saveList(sureSavePicking);
 			}
+			/**
+			 * 一致的,修改领料状态
+			 */
+			List<PickingRequisition> changePicking = PickingInfo.getChangePicking(listPickRequisition);
+			if (null!=changePicking&&changePicking.size()>0){
+				List<Project> listProjectPicking1 = projectService.findListProjectPicking(changePicking);
+				for (Project project:listProjectPicking1){
+					projectService.getUpdateAcquisitionStatus("2",project.getId());
+				}
+			}
 			/*
 				发送通知方法集合
 			 */
 			//根据项目定义号去项目表中查找项目信息
 			List<Project> listProjectPicking = projectService.findListProjectPicking(duplicateRemoval);
-			//根据项目的id去数据库中查找项目领导审核时间
-			List<Acquisition> findListDate = pickingRequisitionService.getFindListDate(listProjectPicking);
-			//得到整合后的list集合（存在项目信息）
-			List<ProjectAcquisition> listProjectAcquisition = PickingInfo.getListProjectAcquisition(listProjectPicking, findListDate);
+			if (null!=listProjectPicking&&listProjectPicking.size()>0){
+				//根据项目的id去数据库中查找项目领导审核时间
+				List<Acquisition> findListDate = pickingRequisitionService.getFindListDate(listProjectPicking);
+				if (null!=findListDate&&findListDate.size()>0){
+					//得到整合后的list集合（存在项目信息）
+					List<ProjectAcquisition> listProjectAcquisition = PickingInfo.getListProjectAcquisition(listProjectPicking, findListDate);
 
-			//得到存在项目（不一致且超过三天的）
-//			List<PickingRequisition> notifyPickingRequisitions = PickingInfo.getJudgeDatePicking(listPickRequisition,listProjectAcquisition);
+					//得到存在项目（不一致且超过三天的）
+					//			List<PickingRequisition> notifyPickingRequisitions = PickingInfo.getJudgeDatePicking(listPickRequisition,listProjectAcquisition);
 
-			//得到和项目表匹配的pickAcquisition的集合同时判断给超过三天的领料做标识
-			List<PickingRequisition> listSameSetOf = PickingInfo.getListSameSetOf(listProjectAcquisition, pickingRequisitions);
-			//获得该项目是否允许领料是否允许领料状态的项目:返回不一致集合
-			List<PickingRequisition> notifyPickingRequisitions = PickingInfo.getUnifiedPicking(listSameSetOf);
+					//得到和项目表匹配的pickAcquisition的集合同时判断给超过三天的领料做标识
+					List<PickingRequisition> listSameSetOf = PickingInfo.getListSameSetOf(listProjectAcquisition, listPickRequisition);
+					//获得该项目是否允许领料是否允许领料状态的项目:返回不一致集合
+					List<PickingRequisition> notifyPickingRequisitions = PickingInfo.getUnifiedPicking(listSameSetOf);
 
-			//根据物料编码进行去重
-			List<PickingRequisition> duplicateRemovalMaterCode = PickingInfo.getDuplicateRemovalMaterCode(notifyPickingRequisitions);
+					//根据物料编码进行去重
+					List<PickingRequisition> duplicateRemovalMaterCode = PickingInfo.getDuplicateRemovalMaterCode(notifyPickingRequisitions);
+					if (null!=duplicateRemovalMaterCode&&duplicateRemovalMaterCode.size()>0){
+						//得到库存对应的集合
+						List<MaterialInventory> byListPicking = materialInventoryService.findByListPicking(duplicateRemovalMaterCode);
 
-			//得到库存对应的集合
-			List<MaterialInventory> byListPicking = materialInventoryService.findByListPicking(duplicateRemovalMaterCode);
+						//所有缺货未缺货信息的登记
+						List<PickingRequisition> whetherStock = PickingInfo.getWhetherStock(notifyPickingRequisitions, byListPicking);
 
-			//所有缺货未缺货信息的登记
-			List<PickingRequisition> whetherStock = PickingInfo.getWhetherStock(notifyPickingRequisitions, byListPicking);
+						//得到非缺货信息1的通知
+						String noStock = PickingInfo.getNoStock(whetherStock);
+						//得到缺货信息3的通知
+						String yesStock2 = PickingInfo.getYesStock2(whetherStock);
+						//得到缺货信息2的通知
+						String yesStock1 = PickingInfo.getYesStock1(whetherStock);
+						//发送通知方法
+						//非缺货信息1
+						if (!"".equals(noStock)){
+							int count = 0;
+							List<String> listUserId = PickingInfo.getListUserId(PickingInfo.ALL_USER_ID);
+							List<String> userId = pickingRequisitionService.findUserId(listUserId);
+							String stringJoiningTogether = PickingInfo.getStringJoiningTogether(userId);//获取通知人
+							OaNotify oaNotify = new OaNotify();
+							oaNotify.setType("5");
+							oaNotify.setTitle("非缺货信息");
+							oaNotify.setContent(noStock);
+							oaNotify.setStatus("1");
+							oaNotify.setOaNotifyRecordIds(stringJoiningTogether);
+							oaNotifyService.save(oaNotify);
+							List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
+							for(OaNotifyRecord o : list){
+								count++;
+								//发送通知到客户端
+								ServletContext context = SpringContextHolder
+										.getBean(ServletContext.class);
+								new SystemInfoSocketHandler().sendMessageToUser(UserUtils.get(o.getUser().getId()).getLoginName(), "收到一条新通知，请到我的通知查看！");
+							}
+							str="已经发送非缺货信息;";
+						}
+						//非缺货信息2
+						if (!"".equals(yesStock1)){
+							int count = 0;
+							List<String> listUserId = PickingInfo.getListUserId(PickingInfo.QH_USER_ID);
+							List<String> userId = pickingRequisitionService.findUserId(listUserId);
+							String stringJoiningTogether = PickingInfo.getStringJoiningTogether(userId);//获取通知人
+							OaNotify oaNotify = new OaNotify();
+							oaNotify.setType("6");
+							oaNotify.setTitle("缺货信息");
+							oaNotify.setContent(yesStock1);
+							oaNotify.setStatus("1");
+							oaNotify.setOaNotifyRecordIds(stringJoiningTogether);
+							oaNotifyService.save(oaNotify);
+							List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
+							for(OaNotifyRecord o : list){
+								count++;
+								//发送通知到客户端
+								ServletContext context = SpringContextHolder
+										.getBean(ServletContext.class);
+								new SystemInfoSocketHandler().sendMessageToUser(UserUtils.get(o.getUser().getId()).getLoginName(), "收到一条新通知，请到我的通知查看！");
+							}
+							str+="已经发送缺货信息;";
+						}
+						//非缺货信息2
+						if (!"".equals(yesStock2)){
+							int count = 0;
+							List<String> listUserId = PickingInfo.getListUserId(PickingInfo.QH_USER_ID);
+							List<String> userId = pickingRequisitionService.findUserId(listUserId);
+							String stringJoiningTogether = PickingInfo.getStringJoiningTogether(userId);//获取通知人
+							OaNotify oaNotify = new OaNotify();
+							oaNotify.setType("7");
+							oaNotify.setTitle("缺货项目信息");
+							oaNotify.setContent(yesStock2);
+							oaNotify.setStatus("1");
+							oaNotify.setOaNotifyRecordIds(stringJoiningTogether);
+							oaNotifyService.save(oaNotify);
+							List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
+							for(OaNotifyRecord o : list){
+								count++;
+								//发送通知到客户端
+								ServletContext context = SpringContextHolder
+										.getBean(ServletContext.class);
+								new SystemInfoSocketHandler().sendMessageToUser(UserUtils.get(o.getUser().getId()).getLoginName(), "收到一条新通知，请到我的通知查看！");
+							}
+							str+="已经发送缺货项目信息;";
+						}
+					}
 
-			//得到非缺货信息1的通知
-			String noStock = PickingInfo.getNoStock(whetherStock);
-			//得到缺货信息3的通知
-			String yesStock2 = PickingInfo.getYesStock2(whetherStock);
-			//得到缺货信息2的通知
-			String yesStock1 = PickingInfo.getYesStock1(whetherStock);
-			//发送通知方法
-			//非缺货信息1
-			if (!"".equals(noStock)){
-				List<String> listUserId = PickingInfo.getListUserId(PickingInfo.CS_XMJL);
-				List<String> userId = pickingRequisitionService.findUserId(listUserId);
-				String stringJoiningTogether = PickingInfo.getStringJoiningTogether(userId);//获取通知人
-				OaNotify oaNotify = new OaNotify();
-				oaNotify.setType("5");
-				oaNotify.setTitle("非缺货信息");
-				oaNotify.setContent(noStock);
-				oaNotify.setStatus("1");
-				oaNotify.setOaNotifyRecordIds(stringJoiningTogether);
-				oaNotifyService.save(oaNotify);
-				List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
-				for(OaNotifyRecord o : list){
-					//发送通知到客户端
-					ServletContext context = SpringContextHolder
-							.getBean(ServletContext.class);
-					new SystemInfoSocketHandler().sendMessageToUser(UserUtils.get(o.getUser().getId()).getLoginName(), "收到一条新通知，请到我的通知查看！");
 				}
 			}
-			//非缺货信息2
-			if (!"".equals(yesStock1)){
-				List<String> listUserId = PickingInfo.getListUserId(PickingInfo.CS_XMJL);
-				List<String> userId = pickingRequisitionService.findUserId(listUserId);
-				String stringJoiningTogether = PickingInfo.getStringJoiningTogether(userId);//获取通知人
-				OaNotify oaNotify = new OaNotify();
-				oaNotify.setType("6");
-				oaNotify.setTitle("缺货信息");
-				oaNotify.setContent(yesStock1);
-				oaNotify.setStatus("1");
-				oaNotify.setOaNotifyRecordIds(stringJoiningTogether);
-				oaNotifyService.save(oaNotify);
-				List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
-				for(OaNotifyRecord o : list){
-					//发送通知到客户端
-					ServletContext context = SpringContextHolder
-							.getBean(ServletContext.class);
-					new SystemInfoSocketHandler().sendMessageToUser(UserUtils.get(o.getUser().getId()).getLoginName(), "收到一条新通知，请到我的通知查看！");
-				}
-			}
-			//非缺货信息2
-			if (!"".equals(yesStock2)){
-				List<String> listUserId = PickingInfo.getListUserId(PickingInfo.CS_XMJL);
-				List<String> userId = pickingRequisitionService.findUserId(listUserId);
-				String stringJoiningTogether = PickingInfo.getStringJoiningTogether(userId);//获取通知人
-				OaNotify oaNotify = new OaNotify();
-				oaNotify.setType("7");
-				oaNotify.setTitle("缺货项目信息");
-				oaNotify.setContent(yesStock2);
-				oaNotify.setStatus("1");
-				oaNotify.setOaNotifyRecordIds(stringJoiningTogether);
-				oaNotifyService.save(oaNotify);
-				List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
-				for(OaNotifyRecord o : list){
-					//发送通知到客户端
-					ServletContext context = SpringContextHolder
-							.getBean(ServletContext.class);
-					new SystemInfoSocketHandler().sendMessageToUser(UserUtils.get(o.getUser().getId()).getLoginName(), "收到一条新通知，请到我的通知查看！");
-				}
-			}
-			j.setMsg( "已成功导入 "+sureSavePicking.size()+" 条领料表单记录");
-//		} catch (Exception e) {
-//			j.setSuccess(false);
-//			j.setMsg("导入领料表单失败！失败信息："+e.getMessage());
-//		}
+			j.setMsg( "已成功导入 "+sureSavePicking.size()+" 条领料表单记录."+str);
+		} catch (Exception e) {
+			j.setSuccess(false);
+			j.setMsg("导入领料表单失败！失败信息："+e.getMessage());
+		}
 		return j;
 	}
 }

src/main/webapp/webpage/modules/sg/managementcenter/project/projectList.js

@@ -386,11 +386,6 @@ $(document).ready(function() {
                        title: '站房DTU',
                        width:120
                    }
-                   ,{
-                       field: 'itemType',
-                       title: '项目类型',
-                       width:120
-                   }
 
 		     ]