施工交底，项目经理组织交底修改项目交底结论，修改页面，选取框回显变更

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

@@ -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/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;
@@ -19,7 +20,8 @@ public class Acquisition extends ActEntity<Acquisition> {
     private Integer exportAfter;
     //导出erp领料单时间
     private Date exportTime;
-
+    //审核通过时间
+    private Date managerTime;
 
     public String getProjectId() {
         return projectId;
@@ -69,11 +71,23 @@ public class Acquisition extends ActEntity<Acquisition> {
         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;
+    }
 }

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">

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/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/webapp/webpage/modules/sg/managementcenter/activiti/divideForm.jsp

@@ -121,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>
@@ -144,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>
@@ -155,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>
@@ -168,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>
@@ -179,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>
@@ -192,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>
@@ -209,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>
@@ -221,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>
@@ -235,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>
@@ -253,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>
@@ -274,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/picking/activiti/exportErp.js

@@ -68,34 +68,33 @@ $(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: 'availableStockQuantity',
-					title: '可用库存数量',
+					field: 'theNumber',
+					title: '第几次领料',
+					width:'200px'
 				}, {
-					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");
 		}

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

@@ -10,16 +10,12 @@
 </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>
 			<table id="informationTable"  data-toolbar="#toolbar" class="table"></table>
 		</div>
 	</div>
-	</div>
 </body>
 </html>