Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -1291,15 +1291,17 @@ public class ActTaskService extends BaseService {
 		boolean pass3 = false;
 		boolean pass4 = false;
 		boolean pass5 = false;
+		boolean pass6 = false;
 		Map<String, Object> vars = Maps.newHashMap();
 		//pass对应进入问题模块，pass4对应没有问题完成施工交底
 		vars.put("pass", false);
-		vars.put("pass4", false);
 		vars.put("pass1", false);
 		vars.put("pass2", false);
+		vars.put("pass4", false);
 		vars.put("pass3", false);
 		vars.put("pass5", false);
 		vars.put("pass6", false);
+		vars.put("countryside", false);
 		String flag = act.getFlag();
 		String[] split = flag.split(";");
 		for (String a : split) {
@@ -1314,7 +1316,7 @@ public class ActTaskService extends BaseService {
 			} else if ("pass5".equals(a)) {
 				pass5 = true;
 			} else if ("pass6".equals(a)) {
-				pass5 = true;
+				pass6 = true;
 			}
 		}
 		if (pass4 == true) {
@@ -1326,26 +1328,26 @@ public class ActTaskService extends BaseService {
 			String processer = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:施工单位组织交底");
 			vars.put("processer", processer);
 			vars.put("pass4", true);
-			complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 		} else {
+			Project user = MyActiviUtils.findUser(act.getProcInsId());
 			if (pass1 == true) {
 				vars.put("pass1", true);
-				Project user = MyActiviUtils.findUser(act.getProcInsId());
 				vars.put("design", user.getRunUnitRole());
 			}
 			if (pass2 == true) {
 				vars.put("pass2", true);
-				Project user = MyActiviUtils.findUser(act.getProcInsId());
 				vars.put("itemClose", user.getDistributionEngineering());
 			}
 			if (pass3 == true) {
 				vars.put("pass3", true);
-				Project user = MyActiviUtils.findUser(act.getProcInsId());
 				vars.put("coveredPerson", user.getConstructionUnitRole());
 			}
 			if (pass5 == true) {
 				vars.put("pass5", true);
-				Project user = MyActiviUtils.findUser(act.getProcInsId());
+				vars.put("policy", user.getDistributionPolicy());
+			}
+			if (pass6 == true) {
+				vars.put("countryside", true);
 				vars.put("policy", user.getDistributionPolicy());
 			}
 			vars.put("problem", true);
@@ -1354,8 +1356,8 @@ public class ActTaskService extends BaseService {
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = act.getTaskDefKey();
 			// 提交流程任务
-			complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 		}
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 
 	}
 
@@ -1449,103 +1451,101 @@ public class ActTaskService extends BaseService {
 	@Transactional(readOnly = false)
 	public void divideForm(Act act) {
 		/*
-		 * pass1 = 设计变更
-		 * pass2 = 项目关闭
-		 * pass3 = 政策处理（城区道路）
-		 * pass4 = 驳回施工单位
-		 * pass5 = 政策处理（农场/民事）
+		 * pass1 = 政策处理（城区道路）
+		 * pass2 =
+		 * pass5 = 农村
 		 * */
-		boolean pass1 = false;
-		boolean pass2 = false;
+		boolean design = false;
+		boolean close = false;
 		boolean pass3 = false;
-		boolean pass4 = false;
 		boolean pass5 = false;
 		boolean pass6 = false;
-		boolean pass7 = false;//无问题
+		boolean finish = false;
+
+
 		Map<String, Object> vars = Maps.newHashMap();
-		//pass对应进入问题模块，pass4对应没有问题完成施工交底
+		//完成施工交底
 		vars.put("pass", false);
-		vars.put("pass4", false);
+		//人工判断设计变更
 		vars.put("pass1", false);
+		//项目关闭
 		vars.put("pass2", false);
+		//行政政处
 		vars.put("pass3", false);
+		//前置条件，人工判断
+		vars.put("pass4", false);
+		//农村政处
 		vars.put("pass5", false);
-		vars.put("pass6",false);
+		//通过页面修改施工交底
 		vars.put("self", true);
+		//没有前置条件，人工审核
 		vars.put("problem", false);
+		//(民事/行政)
+		vars.put("countryside", false);
+		//没有问题
+		vars.put("finish", false);
 		String flag = act.getFlag();
 		String[] split = flag.split(";");
 		for (String a : split) {
 			if ("pass1".equals(a)) {
-				pass1 = true;
+				design = true;//设计变更
 			} else if ("pass2".equals(a)) {
-				pass2 = true;
-			} else if ("pass3".equals(a)) {
+				//项目关闭
+				close = true;
+			} else if ("pass3".equals(a)) {//行政政处（城区道路）
 				pass3 = true;
-			} else if ("pass4".equals(a)) {
-				pass4 = true;
 			} else if ("pass5".equals(a)) {
-				pass5 = true;
+				pass5 = true;//农村政处
 			} else if ("pass6".equals(a)) {
-				pass5 = true;
-			}else if ("pass7".equals(a)){
-				pass6 = true;
+				pass6 = true;//民事政处/行政政处
 			}else if ("pass8".equals(a)){
-				pass7 = true;
+				//没有问题
+				finish = true;
 			}
 		}
-		if (pass6){
-			act.setComment("[人工判断]" + act.getComment());
+
+		if (finish) {
+			//没有问题，完成交底
+			act.setComment("[完成施工交底]" + act.getComment());
 			act.preUpdate();
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = act.getTaskDefKey();
-			// 提交流程任务
-			Project user = MyActiviUtils.findUser(act.getProcInsId());
-			vars.put("processer", user.getProjectManageRole());
-			vars.put("pass6", true);
+			vars.put("finish", true);
 			complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
-		}else {
-			if (pass4) {
-				act.setComment("[完成施工交底]" + act.getComment());
-				act.preUpdate();
-				// 对不同环节的业务逻辑进行操作
-				String taskDefKey = act.getTaskDefKey();
-				// 提交流程任务
-				String processer = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:施工单位组织交底");
-				vars.put("processer", processer);
-				vars.put("pass4", true);
-				complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
-			} else {
-				if (pass1) {
+		} else {
+			Project user = MyActiviUtils.findUser(act.getProcInsId());
+			 if (close) {
+				//项目关闭
+				vars.put("pass2", true);
+				vars.put("itemClose", user.getDistributionEngineering());
+			}else  {
+				act.setComment("[存在问题]" + act.getComment());
+				if (design) {
+					//设计变更
 					vars.put("pass1", true);
-					Project user = MyActiviUtils.findUser(act.getProcInsId());
 					vars.put("design", user.getRunUnitRole());
 				}
-				if (pass2) {
-					vars.put("pass2", true);
-					Project user = MyActiviUtils.findUser(act.getProcInsId());
-					vars.put("itemClose", user.getDistributionEngineering());
-				}
 				if (pass3) {
+					//政策处理（城区道路）
 					vars.put("pass3", true);
-					Project user = MyActiviUtils.findUser(act.getProcInsId());
 					vars.put("coveredPerson", user.getConstructionUnitRole());
 				}
 				if (pass5) {
+					//农村
 					vars.put("pass5", true);
-					Project user = MyActiviUtils.findUser(act.getProcInsId());
 					vars.put("policy", user.getDistributionPolicy());
 				}
-				if (pass7){
-					vars.put("pass", true);
-					act.setComment("[存在问题]" + act.getComment());
+				if (pass6){
+					//民事政处/行政政处
+					vars.put("countryside", true);
+					vars.put("policy", user.getDistributionPolicy());
 				}
-				act.preUpdate();
-				// 对不同环节的业务逻辑进行操作
-				String taskDefKey = act.getTaskDefKey();
-				// 提交流程任务
-				complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 			}
+			act.preUpdate();
+			// 对不同环节的业务逻辑进行操作
+			String taskDefKey = act.getTaskDefKey();
+			// 提交流程任务
+			complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 		}
 	}
 
@@ -2604,6 +2604,9 @@ public class ActTaskService extends BaseService {
 		String taskDefKey = act.getTaskDefKey();
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
+		if ("yes".equals(flag)) {
+			showListService.updateManagerTime(act.getProcInsId());
+		}
 		vars.put("pass", "yes".equals(flag)? true : false);
 		vars.put("manager", "yes".equals(flag)? "" : "沈忱");
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyImportUtils.java

@@ -34,6 +34,10 @@ public class MyImportUtils {
             String projectName = disclose.getRequireName();
             //设备基础是否可以扩容
             String capacity = disclose.getCapacity();
+            //现场设备尺寸
+            String sceneSize = disclose.getSceneSize();
+            //最多可扩容尺寸
+            String capacitySize = disclose.getCapacitySize();
             //方案安全隐患
             String hiddenDanger = disclose.getHiddenDanger();
             //是否存在低压或通信线等影响施工
@@ -77,6 +81,11 @@ public class MyImportUtils {
                     flag = true;
                     tips += "设备基础是否可以扩容填写有误";
                 }
+                if("是".equals(capacity)){
+                    if("".equals(sceneSize) || sceneSize == null||"".equals(capacitySize) || capacitySize == null){
+                        tips += "设备基础是否可以扩容填写有误";
+                    }
+                }
                 if ("".equals(hiddenDanger) || hiddenDanger == null||(!"有".equals(hiddenDanger)&&!"无".equals(hiddenDanger))) {
                     flag = true;
                     tips += "方案安全隐患填写有误";
@@ -121,11 +130,28 @@ public class MyImportUtils {
                         tips += "图纸现场不一致说明不能为空";
                     }
                 }
-                if ("".equals(administrationType) || administrationType == null||(!"1.农村政处".equals(administrationType)&&!"2.民事政处/行政政处（公路/水利）".equals(administrationType)&&!"3.行政政处（城区道路）".equals(administrationType)&&!"4.无".equals(administrationType))) {
+                if ("".equals(administrationType) || administrationType == null
+                        ||(!"1.农村政处".equals(administrationType)
+                            &&!"2.民事政处/行政政处（公路/水利）".equals(administrationType)
+                            &&!"3.行政政处（城区道路）".equals(administrationType)
+                            &&!"4.无".equals(administrationType)
+                            &&!"1.农村政处;2.民事政处/行政政处（公路/水利）".equals(administrationType)
+                            &&!"1.农村政处;3.行政政处（城区道路）".equals(administrationType)
+                            &&!"2.民事政处/行政政处（公路/水利）;3.行政政处（城区道路）".equals(administrationType)
+                            &&!"1.农村政处;2.民事政处/行政政处（公路/水利）;3.行政政处（城区道路）".equals(administrationType)
+                        )
+                ) {
                     flag = true;
                     tips += "政处类型填写有误";
                 }else {
-                    if (("1.农村政处".equals(administrationType)||"2.民事政处/行政政处（公路/水利）".equals(administrationType)||"3.行政政处（城区道路）".equals(administrationType))) {
+                    if (("1.农村政处".equals(administrationType)
+                            ||"2.民事政处/行政政处（公路/水利）".equals(administrationType)
+                            ||"3.行政政处（城区道路）".equals(administrationType)
+                            ||"1.农村政处;2.民事政处/行政政处（公路/水利）".equals(administrationType)
+                            ||"1.农村政处;3.行政政处（城区道路）".equals(administrationType)
+                            ||"2.民事政处/行政政处（公路/水利）;3.行政政处（城区道路）".equals(administrationType)
+                            ||"1.农村政处;2.民事政处/行政政处（公路/水利）;3.行政政处（城区道路）".equals(administrationType)
+                        )) {
                         if ("".equals(policyHandlingInstructions) || policyHandlingInstructions == null) {
                             flag = true;
                             tips += "政策处理说明不能为空";
@@ -144,6 +170,11 @@ public class MyImportUtils {
                     flag = true;
                     tips += "设备是否有整体改造的必要填写有误";
                 }
+                if ("户外".equals(disclose.getPlacementMode())||"户内".equals(disclose.getPlacementMode())){
+                    if ("".equals(disclose.getProductionDate())||disclose.getProductionDate() == null){
+                        tips +="核查环网柜生产日期不能为空;";
+                    }
+                }
             }
             if (flag == true) {
                 fin += "<" + projectName + ">" + ":" + tips + "</br>";

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/DivideController.java

@@ -250,9 +250,6 @@ public class DivideController extends BaseController {
         int successNum = 0;
         boolean flag = true;
         String failureMsg = "";
-        //查询是当前经理负责的项目
-
-
         //将当前经理负责的项目导入的交底结论循环
         //做数据验证，验证成功的记录，不成功的抛出异常
         //验证成功的list插入数据库
@@ -334,22 +331,22 @@ public class DivideController extends BaseController {
                     //前置条件，人工判断
                     vars.put("pass4",false);
                     //判断是否有前置条件
-                    if ((precondition != null && !"".equals(precondition))) {
-                        vars.put("problem",false);
+                    if ((precondition != null && !"".equals(precondition)) || (d.getChannel() != null && !"".equals(d.getChannel()) && !"无".equals(d.getChannel()))) {
+                        vars.put("problem", false);
                         vars.put("pass4", true);
                         vars.put("processer", user.getProjectManageRole());
                     } else {
                         //没有前置条件，判断是否为无问题
                         if (
                                 "无".equals(d.getHiddenDanger()) &&
-                                "否".equals(d.getInfluenceConstruction()) &&
-                                "否".equals(d.getProjectRepetition()) &&
-                                "否".equals(d.getImplemented()) &&
-                                "有".equals(d.getTransformer()) &&
-                                "一致".equals(d.getLineName()) &&
-                                "是".equals(d.getQuantities()) &&
-                                "一致".equals(d.getRodNumber()) &&
-                                "4.无".equals(d.getAdministrationType())
+                                        "否".equals(d.getInfluenceConstruction()) &&
+                                        "否".equals(d.getProjectRepetition()) &&
+                                        "否".equals(d.getImplemented()) &&
+                                        "有".equals(d.getTransformer()) &&
+                                        "一致".equals(d.getLineName()) &&
+                                        "是".equals(d.getQuantities()) &&
+                                        "一致".equals(d.getRodNumber()) &&
+                                        "4.无".equals(d.getAdministrationType())
                         ) {
                             vars.put("finish", true);
                         } else {

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

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.sg.picking.activiti.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.persistence.ActEntity;
 
 import java.util.Date;
@@ -16,10 +17,13 @@ public class Acquisition extends ActEntity<Acquisition> {
     //是否可以导出erp领料单
     private Integer exportStatus;
     //是否开过领料单
-    private Integer exportAfter;
+    private String exportAfter;
     //导出erp领料单时间
     private Date exportTime;
-
+    //审核通过时间
+    private Date managerTime;
+    //项目类型
+    private String itemType;
 
     public String getProjectId() {
         return projectId;
@@ -61,19 +65,39 @@ public class Acquisition extends ActEntity<Acquisition> {
         this.exportStatus = exportStatus;
     }
 
-    public Integer getExportAfter() {
+    public String getExportAfter() {
         return exportAfter;
     }
 
-    public void setExportAfter(Integer exportAfter) {
+    public void setExportAfter(String exportAfter) {
         this.exportAfter = exportAfter;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getExportTime() {
         return exportTime;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public void setExportTime(Date exportTime) {
         this.exportTime = exportTime;
     }
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public Date getManagerTime() {
+        return managerTime;
+    }
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public void setManagerTime(Date managerTime) {
+        this.managerTime = managerTime;
+    }
+
+    public String getItemType() {
+        return itemType;
+    }
+
+    public void setItemType(String itemType) {
+        this.itemType = itemType;
+    }
 }

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

@@ -0,0 +1,242 @@
+package com.jeeplus.modules.sg.picking.activiti.entity;
+
+/**
+ * 导出实体类
+ */
+public class CapitalExport {
+    //编号
+    private String erpNumber;
+    //wbs
+    private String projectWbsNumber;
+    //单体工程名称
+    private String projectName;
+    //WBS元素编码
+    private String wbsNumber;
+    //WBS描述
+    private String wbsDescription;
+    //设备序号
+    private String deviceSerialNumber;
+    //非安装设备标识
+    private String identification;
+    //建筑及线路资产标识
+    private String buildLines;
+    //建筑及设备名称
+    private String nameOfBuilding;
+    //型号规格
+    private String modelSpecification;
+    //设备类型
+    private String equipmentType;
+    //SAP物料编码
+    private String sapMaterialCode;
+    //SAP物料扩展编码
+    private String sapExtensionCode;
+    //单位
+    private String company;
+    //数量
+    private String number;
+    //概算价格
+    private String estimatedPrice;
+    //需求日期
+    private String demandDate;
+    //交货地点及交货方式
+    private String deliveryPlace;
+    //需求计划备注
+    private String demandPlan;
+    //需求部门
+    private String demandDepartment;
+    //申请人
+    private String applicant;
+    //电话号码
+    private String phoneNumber;
+    //前期厂家
+    private String previousManufacturers;
+    //自行采购标识
+    private String selfPurchaseIdentification;
+    //特殊采购标识
+    private String specialPurchaseIdentification;
+    //使用环境
+    private String useEnvironment;
+    //合同草稿号
+    private String contractNo;
+    //合同草稿行项目号
+    private String itemNo;
+    //电商平台技术规范书ID
+    private String idOfCommerce;
+
+
+    public String getErpNumber() {
+        return erpNumber;
+    }
+
+    public void setErpNumber(String erpNumber) {
+        this.erpNumber = erpNumber;
+    }
+
+    public String getProjectWbsNumber() {
+        return projectWbsNumber;
+    }
+
+    public void setProjectWbsNumber(String projectWbsNumber) {
+        this.projectWbsNumber = projectWbsNumber;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getWbsNumber() {
+        return wbsNumber;
+    }
+
+    public void setWbsNumber(String wbsNumber) {
+        this.wbsNumber = wbsNumber;
+    }
+
+    public String getWbsDescription() {
+        return wbsDescription;
+    }
+
+    public void setWbsDescription(String wbsDescription) {
+        this.wbsDescription = wbsDescription;
+    }
+
+    public String getDeviceSerialNumber() {
+        return deviceSerialNumber;
+    }
+
+    public void setDeviceSerialNumber(String deviceSerialNumber) {
+        this.deviceSerialNumber = deviceSerialNumber;
+    }
+
+    public String getIdentification() {
+        return identification;
+    }
+
+    public void setIdentification(String identification) {
+        this.identification = identification;
+    }
+
+    public String getBuildLines() {
+        return buildLines;
+    }
+
+    public void setBuildLines(String buildLines) {
+        this.buildLines = buildLines;
+    }
+
+    public String getNameOfBuilding() {
+        return nameOfBuilding;
+    }
+
+    public void setNameOfBuilding(String nameOfBuilding) {
+        this.nameOfBuilding = nameOfBuilding;
+    }
+
+    public String getModelSpecification() {
+        return modelSpecification;
+    }
+
+    public void setModelSpecification(String modelSpecification) {
+        this.modelSpecification = modelSpecification;
+    }
+
+    public String getEquipmentType() {
+        return equipmentType;
+    }
+
+    public void setEquipmentType(String equipmentType) {
+        this.equipmentType = equipmentType;
+    }
+
+    public String getSapMaterialCode() {
+        return sapMaterialCode;
+    }
+
+    public void setSapMaterialCode(String sapMaterialCode) {
+        this.sapMaterialCode = sapMaterialCode;
+    }
+
+    public String getSapExtensionCode() {
+        return sapExtensionCode;
+    }
+
+    public void setSapExtensionCode(String sapExtensionCode) {
+        this.sapExtensionCode = sapExtensionCode;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public String getEstimatedPrice() {
+        return estimatedPrice;
+    }
+
+    public void setEstimatedPrice(String estimatedPrice) {
+        this.estimatedPrice = estimatedPrice;
+    }
+
+    public String getDemandDate() {
+        return demandDate;
+    }
+
+    public void setDemandDate(String demandDate) {
+        this.demandDate = demandDate;
+    }
+
+    public String getDeliveryPlace() {
+        return deliveryPlace;
+    }
+
+    public void setDeliveryPlace(String deliveryPlace) {
+        this.deliveryPlace = deliveryPlace;
+    }
+
+    public String getDemandPlan() {
+        return demandPlan;
+    }
+
+    public void setDemandPlan(String demandPlan) {
+        this.demandPlan = demandPlan;
+    }
+
+    public String getDemandDepartment() {
+        return demandDepartment;
+    }
+
+    public void setDemandDepartment(String demandDepartment) {
+        this.demandDepartment = demandDepartment;
+    }
+
+    public String getApplicant() {
+        return applicant;
+    }
+
+    public void setApplicant(String applicant) {
+        this.applicant = applicant;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+}

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

@@ -0,0 +1,6 @@
+package com.jeeplus.modules.sg.picking.activiti.entity;
+/**
+ * 成本项目导出类
+ * */
+public class CostDerivation {
+}

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

@@ -7,6 +7,7 @@ import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.audit.information.entity.Information;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
+import com.jeeplus.modules.sg.picking.activiti.entity.Acquisition;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickIng;
 import com.jeeplus.modules.sg.picking.activiti.entity.ProjectNumber;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
@@ -40,4 +41,9 @@ public interface PickIngMapper extends BaseMapper<PickIng> {
      * 插入领料清单
      * */
     void processList(@Param("showList")List<ShowList> showList);
+
+    /**
+     * 获取选择项目的流程实例id与类型
+     * */
+    List<Acquisition> findErpType(List<String> list);
 }

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

@@ -85,4 +85,9 @@ public interface ShowListMapper extends BaseMapper<ShowList> {
      * 所有项目的领料单
      */
     List<Acquisition> acquisitionList();
+
+    /**
+     * 记录项目中心领导审核领料单通过时间
+     */
+    void updateManagerTime(String procInsId);
 }

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

@@ -34,7 +34,7 @@
     <select id="findAllList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.PickIng">
         SELECT
         <include refid="classColumns"/>
-        FROM md_module_block a where md_version = #{version} order by md_big_sort,md_the_sort,md_small_sort
+        FROM md_module_block a where md_version = (select id from md_module_block_version where versionName = #{version}) order by md_big_sort,md_the_sort,md_small_sort
     </select>
 
     <insert id="insert">
@@ -96,7 +96,7 @@
 	</update>
 
 	<select id="allVersion" resultType="string">
-		select versionName from md_module_block_version group by create_date desc;
+		select versionName from md_module_block_version order by create_date desc;
 	</select>
 
 	<update id="updateSelectNumber">
@@ -116,7 +116,7 @@
 	</select>
 
 	<update id="updateSelectVersion">
-				UPDATE sys_dict_value set `value` = #{version} where id = '1010101010'
+		UPDATE sys_dict_value set `value` = #{version} where id = '1010101010'
 	</update>
 	
 	<insert id="processList">
@@ -162,5 +162,17 @@
 		</foreach>
 	</insert>
 
-
+	<select id="findErpType" resultType="com.jeeplus.modules.sg.picking.activiti.entity.Acquisition">
+		select a.id,a.proc_ins_id,b.item_type
+		from md_acquisition_process as a
+		LEFT JOIN xm_project_details as b
+		on a.project_id = b.id where a.id
+		in(
+		(
+		<foreach collection="list" item="item" separator=",">
+			#{item}
+		</foreach>
+		)
+		)
+	</select>
 </mapper>

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

@@ -76,6 +76,7 @@
 			the_number,
 			version,
 			select_number,
+			exportAfter,
 			create_by,
 			create_date,
 			update_by,
@@ -89,6 +90,7 @@
 			#{theNumber},
 			#{sVersion},
 			#{selectNumber},
+			'无',
 			#{createBy.id},
 			#{createDate},
 			#{updateBy.id},
@@ -217,46 +219,6 @@
 		delete from md_process_list where id=#{id};
 	</delete>
 
-	<!--<insert id="insertProcess">
-		INSERT INTO md_process_list(
-			ID,
-			CREATE_BY,
-			CREATE_DATE,
-			UPDATE_BY,
-			UPDATE_DATE,
-			DEL_FLAG,
-			REMARKS,
-			PROCINSID,
-			MATERIALCODE,
-			EXTENSIONDESCRIPTION,
-			MATERIALDESCRIPTION,
-			MDUNITS,
-			MDTOTALAMOUNT,
-			MDSINGLEWEIGHT,
-			MDTOTALWEIGHT,
-			MDTHEPARTY,
-			MDTEXT
-		)VALUES(
-			#{id},
-			#{createBy.id},
-			#{createDate},
-			#{updateBy.id},
-			#{updateDate},
-			#{remarks},
-			#{delFlag},
-			#{procinsid},
-			#{materialcode},
-			#{extensiondescription},
-			#{materialdescription},
-			#{mdunits},
-			#{mdtotalamount},
-			#{mdsingleweight},
-			#{mdtotalweight},
-			#{mdtheparty},
-			#{mdtex}T
-		);
-	</insert>-->
-
 	<select id="inventoryQuery" resultType="com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory">
 		select materialCode,availableStockQuantity,materialDetail from xm_material_inventory
 		where materialCode in
@@ -283,14 +245,20 @@
 		a.proc_ins_id,
 		b.require_name as projectId,
 		a.version,
+		a.the_number,
 		a.select_number,
 		a.exportStatus,
 		a.exportAfter,
-		a.exportTime
+		a.exportTime,
+		a.managerTime
 		from md_acquisition_process as a
 		left join xm_project_details as b
-		on a.project_id = b.project_id
+		on a.project_id = b.id
 		where exportStatus = '1'
 		order by exportAfter;
 	</select>
+
+	<update id="updateManagerTime">
+		update md_acquisition_process set managerTime = NOW(),exportStatus = 1 where proc_ins_id = #{procInsId};
+	</update>
 </mapper>

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

@@ -112,7 +112,9 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 						mdSmallClass.setId(pc.getId());
 						mdSmallClass.setMdUnit(pc.getMdUnit());
 						if (Global.SYS_TYPE.equals("2")) {
-							mdSmallClass.setMdImg("http://" + request.getServerName() + pc.getMdImg());
+							if (pc.getMdImg() != null && !"".equals(pc.getMdImg())) {
+								mdSmallClass.setMdImg("http://" + request.getServerName() + pc.getMdImg());
+							}
 						} else {
 							mdSmallClass.setMdImg(pc.getMdImg());
 						}
@@ -156,4 +158,8 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 	public void processList(List<ShowList> showList) {
 		pickIngMapper.processList(showList);
 	}
+
+	public List<Acquisition> findErpType(List<String> list) {
+		return pickIngMapper.findErpType(list);
+	}
 }

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

@@ -124,4 +124,7 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 		return showListMapper.processListQuery(list);
 	}
 
+	public void updateManagerTime(String procInsId) {
+		showListMapper.updateManagerTime(procInsId);
+	}
 }

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

@@ -4,10 +4,12 @@ import com.google.common.collect.Maps;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.sg.audit.information.entity.Information;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.FindTask;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
@@ -489,5 +491,36 @@ public class PickIngController extends BaseController {
         }
         return j;
     }
+
+    @ResponseBody
+    @RequestMapping(value = "exportErpData")
+    public AjaxJson exportErpData(String id, HttpServletRequest request, HttpServletResponse response) {
+        AjaxJson j = new AjaxJson();
+        String[] split = id.split(",");
+        List<String> beforeId = new ArrayList<>();
+        for (String a : split) {
+            beforeId.add(a);
+        }
+        //获取选择的id查询出属于什么项目
+        List<Acquisition> erpType = pickIngService.findErpType(beforeId);
+        //资本项目列表
+        List<Acquisition> zbList = new ArrayList<>();
+        //成本项目列表
+        List<Acquisition> cbList = new ArrayList<>();
+        //循环数据，根据类型分组
+        for (Acquisition acquisition:erpType) {
+            String itemType = acquisition.getItemType();
+            if ("资本项目".equals(itemType)) {
+                zbList.add(acquisition);
+            }
+            if ("成本项目".equals(itemType)) {
+                cbList.add(acquisition);
+            }
+        }
+        //根据不同类型导出不同的文件
+
+        //需改导出状态及导出时间
+        return j;
+    }
 }
 

src/main/webapp/webpage/modules/sg/managementcenter/activiti/artificialJudgment.jsp

@@ -16,9 +16,6 @@
 				var cValue ="";//定义一个数组
 				var flag1 = false;//代表是否选择了设计变更/行政政处/农村民事政处的状态，false为未选择，true为选择
 				var flag2 = false;//代表是否选择了项目关闭的状态，false为未选择，true为选择
-				var flag3 = false;//代表是否选择了政策处理 行政政处（城区道路）
-				var flag5 = false;//代表是否选择了农村政处
-				var flag6 = false;//代表是否选择了民事政处/行政政处（公路/水利）
 				var nValue = $('input[name="favorite"]:checked');
 				$('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
 					//判断选取的值如果时pass2，flag2为true，代表选择了项目关闭，选取的值不为pass2，flag1为true代表其它类型被选择
@@ -27,18 +24,6 @@
 					}else {
 						flag1 = true;
 					}
-					//判断值为pass3，代表选择了政策处理 行政政处（城区道路）
-					if ("pass3"==$(this).val()) {
-						flag3 = true;
-					}
-					//判断值为pass5，代表选择了农村政处
-					if ("pass5"==$(this).val()) {
-						flag5 = true;
-					}
-					//判断值为pass6，民事政处/行政政处（公路/水利）
-					if ("pass6"==$(this).val()) {
-						flag6 = true;
-					}
 					cValue=cValue+";"+($(this).val());//将选中的值添加到数组chk_value中
 				});
 
@@ -46,8 +31,6 @@
 					jp.error("请选择问题类型");
 				} else if(flag1==true&&flag2==true){
 					jp.error("项目关闭与其它类型问题不可同时发起");
-				}else if ((flag3==true&&flag5==true)||(flag3==true&&flag6==true)||(flag5==true&&flag6==true)){
-					jp.error("政处类型只能选择一种");
 				}else {
 					jp.prompt(" 审批意见", function (message) {
 						jp.post("${ctx}/act/task/artificialTask",

src/main/webapp/webpage/modules/sg/managementcenter/activiti/divideForm.jsp

@@ -11,61 +11,48 @@
 		$(document).ready(function () {
 			$("#agree").click(function () {
 				var cValue ="";//定义一个数组
-				var flag1 = false;//代表是否选择了设计变更/行政政处/农村民事政处的状态，false为未选择，true为选择
+				var useflag = false;//代表是否选择了设计变更/行政政处/农村民事政处的状态，false为未选择，true为选择
 				var flag2 = false;//代表是否选择了项目关闭的状态，false为未选择，true为选择
-				var flag3 = false;//代表是否选择了政策处理 行政政处（城区道路）
-				var flag5 = false;//代表是否选择了农村政处
-				var flag6 = false;//代表是否选择了民事政处/行政政处（公路/水利）
-				var flag7 = false;//代表是否选择了人工判断
 				var flag8 = false;//代表无问题
+				var flag81 = false;//记录选择无问题的同时，有没有选择其它问题类型
 				var nValue = $('input[name="favorite"]:checked');
 				$('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
+					console.log($(this).val());
 					//判断选取的值如果时pass2，flag2为true，代表选择了项目关闭，选取的值不为pass2，flag1为true代表其它类型被选择
 					if ("pass8" == $(this).val()){
 						flag8 = true;
-					}
-					if ("pass7"==$(this).val()){
-						flag7 = true;
+					}else {
+						flag81 = true;
 					}
 					if ("pass2" == $(this).val()) {
 						flag2 = true;
 					}else {
-						flag1 = true;
-					}
-					//判断值为pass3，代表选择了政策处理 行政政处（城区道路）
-					if ("pass3"==$(this).val()) {
-						flag3 = true;
-					}
-					//判断值为pass5，代表选择了农村政处
-					if ("pass5"==$(this).val()) {
-						flag5 = true;
-					}
-					//判断值为pass6，民事政处/行政政处（公路/水利）
-					if ("pass6"==$(this).val()) {
-						flag6 = true;
+						useflag = true;
 					}
 					cValue=cValue+";"+($(this).val());//将选中的值添加到数组chk_value中
 				});
 				console.log(cValue);
 				if (nValue == null || nValue.size() <= 0) {
 					jp.error("请选择问题类型");
-				} else if(flag1==true&&flag2==true){
+				} else if (flag8 == true&&flag81==true) {
+					jp.error("无问题与其它类型问题不可同时发起");
+				} else if (flag2 == true&&useflag==true) {
 					jp.error("项目关闭与其它类型问题不可同时发起");
-				}else {
+				} else {
 					jp.prompt(" 审批意见", function (message) {
 						jp.post("${ctx}/act/task/divideForm",
 								{
-									"taskId":"${construction.act.taskId}",
-									"taskName":"${construction.act.taskName}",
-									"taskDefKey":"${construction.act.taskDefKey}",
-									"procInsId":"${construction.act.procInsId}",
-									"procDefId":"${construction.act.procDefId}",
-									"flag":cValue,
-									"projectName":"${fns:unescapeHtml(construction.projectName)}",
-									"comment":window.encodeURI(message)
+									"taskId": "${construction.act.taskId}",
+									"taskName": "${construction.act.taskName}",
+									"taskDefKey": "${construction.act.taskDefKey}",
+									"procInsId": "${construction.act.procInsId}",
+									"procDefId": "${construction.act.procDefId}",
+									"flag": cValue,
+									"projectName": "${fns:unescapeHtml(construction.projectName)}",
+									"comment": window.encodeURI(message)
 								},
 								function (data) {
-									if(data.success){
+									if (data.success) {
 										jp.success(data.msg);
 										jp.go("${ctx}/act/task/todo")
 									}
@@ -134,7 +121,7 @@
 								<td class="width-15 active"><label class="pull-right"> 设备基础是否可以扩容：</label></td>
 								<td class="width-35">
 									<c:choose>
-										<c:when test="${construction.disclose.channel}">
+										<c:when test="${not empty construction.disclose.capacity}">
 											<input type='text' readonly="readonly" id='capacity'  name="capacity" class="form-control required"  value="${construction.disclose.capacity}"/>
 										</c:when>
 										<c:otherwise>
@@ -157,7 +144,7 @@
 								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
 								<td class="width-35">
 									<c:choose>
-										<c:when test="${construction.disclose.hiddenDanger}">
+										<c:when test="${not empty construction.disclose.hiddenDanger}">
 											<input type='text' readonly="readonly" id='hiddenDanger'  name="hiddenDanger" class="form-control required"  value="${construction.disclose.hiddenDanger}"/>
 										</c:when>
 										<c:otherwise>
@@ -168,7 +155,7 @@
 								<td class="width-15 active"><label class="pull-right"> 是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
 									<c:choose>
-										<c:when test="${construction.disclose.influenceConstruction}">
+										<c:when test="${not empty construction.disclose.influenceConstruction}">
 											<input type='text' readonly="readonly" id='influenceConstruction'  name="influenceConstruction" class="form-control required"  value="${construction.disclose.influenceConstruction}"/>
 										</c:when>
 										<c:otherwise>
@@ -181,7 +168,7 @@
 								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
 								<td class="width-35">
 									<c:choose>
-										<c:when test="${construction.disclose.projectRepetition}">
+										<c:when test="${not empty construction.disclose.projectRepetition}">
 											<input type='text' readonly="readonly" id='projectRepetition'  name="projectRepetition" class="form-control required"  value="${construction.disclose.projectRepetition}"/>
 										</c:when>
 										<c:otherwise>
@@ -192,7 +179,7 @@
 								<td class="width-15 active"><label class="pull-right"> 是否已实施：</label></td>
 								<td class="width-35">
 									<c:choose>
-										<c:when test="${construction.disclose.implemented}">
+										<c:when test="${not empty construction.disclose.implemented}">
 											<input type='text' readonly="readonly" id='implemented'  name="implemented" class="form-control required"  value="${construction.disclose.implemented}"/>
 										</c:when>
 										<c:otherwise>
@@ -205,7 +192,7 @@
 								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
 								<td class="width-35">
 									<c:choose>
-										<c:when test="${construction.disclose.transformer}">
+										<c:when test="${not empty construction.disclose.transformer}">
 											<input type='text' readonly="readonly" id='transformer'  name="transformer" class="form-control required"  value="${construction.disclose.transformer}"/>
 										</c:when>
 										<c:otherwise>
@@ -222,7 +209,7 @@
 								<td class="width-15 active"><label class="pull-right"> 线路名称一致性：</label></td>
 								<td class="width-35">
 									<c:choose>
-										<c:when test="${construction.disclose.lineName}">
+										<c:when test="${not empty construction.disclose.lineName}">
 											<input type='text' readonly="readonly" id='lineName'  name="lineName" class="form-control required"  value="${construction.disclose.lineName}"/>
 										</c:when>
 										<c:otherwise>
@@ -234,7 +221,7 @@
 								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
 								<td class="width-35">
 									<c:choose>
-										<c:when test="${construction.disclose.quantities}">
+										<c:when test="${not empty construction.disclose.quantities}">
 											<input type='text' readonly="readonly" id='quantities'  name="quantities" class="form-control required"  value="${construction.disclose.quantities}"/>
 										</c:when>
 										<c:otherwise>
@@ -248,7 +235,7 @@
 								<td class="width-15 active"><label class="pull-right"> 设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
 									<c:choose>
-										<c:when test="${construction.disclose.rodNumber}">
+										<c:when test="${not empty construction.disclose.rodNumber}">
 											<input type='text' readonly="readonly" id='rodNumber'  name="rodNumber" class="form-control required"  value="${construction.disclose.rodNumber}"/>
 										</c:when>
 										<c:otherwise>
@@ -266,7 +253,7 @@
 								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
 								<td class="width-35">
 									<c:choose>
-										<c:when test="${construction.disclose.administrationType}">
+										<c:when test="${not empty construction.disclose.administrationType}">
 											<input type='text' readonly="readonly" id='administrationType'  name="administrationType" class="form-control required"  value="${construction.disclose.administrationType}"/>
 										</c:when>
 										<c:otherwise>
@@ -287,7 +274,7 @@
 								<td class="width-15 active"><label class="pull-right"> DTU安放方式核查：</label></td>
 								<td class="width-35">
 									<c:choose>
-										<c:when test="${construction.disclose.placementMode}">
+										<c:when test="${not empty construction.disclose.placementMode}">
 											<input type='text' readonly="readonly" id='placementMode'  name="placementMode" class="form-control required"  value="${construction.disclose.placementMode}"/>
 										</c:when>
 										<c:otherwise>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/editCon.jsp

@@ -148,6 +148,11 @@
 										<form:option value="1.农村政处"/>
 										<form:option value="2.民事政处/行政政处（公路/水利）"/>
 										<form:option value="3.行政政处（城区道路）"/>
+
+										<form:option value="1.农村政处;2.民事政处/行政政处（公路/水利）"/>
+										<form:option value="1.农村政处;3.行政政处（城区道路）"/>
+										<form:option value="2.民事政处/行政政处（公路/水利）;3.行政政处（城区道路）"/>
+										<form:option value="1.农村政处;2.民事政处/行政政处（公路/水利）;3.行政政处（城区道路）"/>
 									</form:select>
                                 </td>
                                 <td class="width-15 active"><label class="pull-right">前置条件：</label></td>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/managerPolicesChange.jsp

@@ -299,14 +299,12 @@
 						</table>
 					</form:form>
 
-
-
 						<div class="row">
 							<div class="col-sm-3"></div>
 							<div class="col-sm-6">
 								<div class="form-group text-center">
-									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="需要设计变更" />&nbsp;
-									<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="取消设计变更" />&nbsp;
+									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="需要政策处理" />&nbsp;
+									<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="取消政策处理" />&nbsp;
 <%--									<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="判断没有问题" />--%>
 								</div>
 							</div>

src/main/webapp/webpage/modules/sg/picking/activiti/exportErp.js

@@ -2,8 +2,6 @@
 <script>
 $(document).ready(function() {
 	var item = "";
-	var procInsId = $("#procInsId").val();
-		console.log(procInsId);
 		//bootstrapTable加载数据
 		$('#informationTable').bootstrapTable({
 			//请求方法
@@ -68,34 +66,36 @@ $(document).ready(function() {
 					checkbox: true
 				},
 				{
-					field: 'materialCode',
-					title: '物料编码',
-				}, {
-					field: 'materialDescription',
+					field: 'projectId',
 					title: '物料名称',
 				}, {
-					field: 'extensionDescription',
-					title: '扩展描述',
-					width:'200px'
-				}, {
-					field: 'mdUnits',
-					title: '单位',
+					field: 'version',
+					title: '模块版本',
 				}, {
-					field: 'mdTotalAmount',
-					title: '总量',
+					field: 'theNumber',
+					title: '第几次领料',
+					width:'200px'
 				}, {
-					field: 'availableStockQuantity',
-					title: '可用库存数量',
+					field: 'exportAfter',
+					title: '是否开过领料单',
 				}, {
-					field: 'mdTheParty',
-					title: '甲乙供',
+					field: 'exportTime',
+					title: '导出erp领料单时间',
 				}, {
-					field: 'mdText',
-					title: '备注',
+					field: 'managerTime',
+					title: '审核通过时间',
 				}
 			]
 		});
 
+	$('#inDate').datetimepicker({
+		format: "YYYY-MM-DD HH:mm:ss"
+	});
+
+	$('#inDate').datetimepicker({
+		format: "YYYY-MM-DD HH:mm:ss"
+	});
+
 	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
 		  $('#informationTable').bootstrapTable("toggleView");
 		}
@@ -103,6 +103,7 @@ $(document).ready(function() {
 	$('#informationTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
 		'check-all.bs.table uncheck-all.bs.table', function () {
 		$('#remove').prop('disabled', ! $('#informationTable').bootstrapTable('getSelections').length);
+		$('#exportErp').prop('disabled', ! $('#informationTable').bootstrapTable('getSelections').length);
 		$('#view,#edit').prop('disabled', $('#informationTable').bootstrapTable('getSelections').length!=1);
 	});
 
@@ -130,4 +131,10 @@ $(document).ready(function() {
 		$('#informationTable').bootstrapTable('refresh');
 	}
 
+	function exportErp(id){
+		if(id == undefined){
+			id = getIdSelections();
+		}
+		jp.downloadFile('${ctx}/picking/activiti/exportErpData?id=' + id);
+	}
 </script>

src/main/webapp/webpage/modules/sg/picking/activiti/exportErp.jsp

@@ -10,16 +10,15 @@
 </head>
 <body>
 	<div class="wrapper wrapper-content">
-	<div class="panel panel-primary">
-	<div class="panel-heading">
-		<h3 class="panel-title">导出erp管理</h3>
-	</div>
-		<form:form id="inputForm" modelAttribute="acquisition" class="form-horizontal">
-			<input type="hidden" id="procInsId" name="procInsId" value="${acquisition.act.procInsId}"/>
-		</form:form>
+		<div class="panel panel-primary">
+			<div class="panel-heading">
+				<h3 class="panel-title">导出erp管理</h3>
+			</div>
+				<button id="exportErp" class="btn btn-warning" onclick="exportErp()">
+					<i class="fa fa-file-excel-o"></i>导出erp
+				</button>
 			<table id="informationTable"  data-toolbar="#toolbar" class="table"></table>
 		</div>
 	</div>
-	</div>
 </body>
 </html>