1.fixBug:修复生产计划页面查询参数不生效问题

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC003.java

@@ -25,6 +25,8 @@ import com.baosight.iplat4j.core.service.soa.XLocalManager;
 import com.baosight.iplat4j.core.web.threadlocal.UserSession;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
+import org.apache.commons.collections.MapUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -59,11 +61,16 @@ public class ServiceHPSC003 extends ServiceBase {
      */
     @Override
     public EiInfo query(EiInfo inInfo) {
-        EiInfo outInfo = super.query(inInfo, "HPSC003.query", new HPSC003());
-        EiBlock blcok = outInfo.addBlock(HPConstants.BLOCK_DETAIL);
-        blcok.setBlockMeta(new HPSC004().eiMetadata);
-        return outInfo;
-
+	    try {
+		    Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+		    queryRow.put("planCompletionDate", DateUtils.formatShort(MapUtils.getString(queryRow,
+				    "planCompletionDate")));
+		    inInfo = super.query(inInfo, HPSC003.QUERY, new HPSC003());
+		    inInfo.addBlock(HPConstants.BLOCK_DETAIL).addBlockMeta(new HPSC004().eiMetadata);
+	    } catch (Throwable e) {
+		    LogUtils.setDetailMsg(inInfo, e, "查询失败");
+	    }
+	    return inInfo;
     }
 
     /**
@@ -151,9 +158,9 @@ public class ServiceHPSC003 extends ServiceBase {
 	        // 刷新明细数据
             inInfo.getBlock(CommonConstant.Field.DETAIL).setRows(dbSc004s);
 	        inInfo.setStatus(EiConstant.STATUS_DEFAULT);
-	        inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
+	        inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据修改成功!");
         } catch (Exception e) {
-	        LogUtils.setDetailMsg(inInfo, e, "新增失败");
+	        LogUtils.setDetailMsg(inInfo, e, "修改失败");
         }
 	    return inInfo;
     }

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC003.xml

@@ -66,8 +66,7 @@
         UPDATED_TIME = #updatedTime#  <!-- 修改时间 -->
     </sql>
 
-	<select id="query" parameterClass="java.util.HashMap"
-			resultClass="com.baosight.hpjx.hp.sc.domain.HPSC003">
+	<select id="query" parameterClass="java.util.HashMap" resultClass="com.baosight.hpjx.hp.sc.domain.HPSC003">
 		SELECT
 		ID as "id",
 		COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->

src/main/webapp/HP/SC/HPSC003.jsp

@@ -6,23 +6,21 @@
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
 
 <EF:EFPage title="生产计划">
-    <EF:EFRegion id="inqu" title="查询条件" align-item="center">
-        <div class="row" >
-            <EF:EFInput blockId="inqu_status" ename="projCode" colWidth="3" cname="项目编号:" />
-            <EF:EFInput blockId="inqu_status" ename="projName" colWidth="3" cname="项目名称:" />
-            <EF:EFSelect ename="inqu_status-0-prdtCode" cname="部件名称" filter="contains" required="false" colWidth="3"
-                         template="#=textField#" valueTemplate="#=valueField#" defaultValue="请选择">
-                <EF:EFOption label="请选择" value=""/>
-                <EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
-            </EF:EFSelect>
-            <EF:EFInput blockId="inqu_status" ename="planInfoNo" colWidth="3" cname="生产计划单号:" />
-            <EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" colWidth="3" cname="计划完成日期:"
-                             format="yyyy-MM-dd"/>
-            <EF:EFSelect cname="状态:" optionLabel="全部" blockId="inqu_status" colWidth="3" ename="status" >
-                <EF:EFOption label="未提交" value="0"/>
-                <EF:EFOption label="已提交" value="1"/>
-            </EF:EFSelect>
+	<EF:EFRegion id="inqu" title="查询条件" align-item="center">
+		<div class="row">
+			<EF:EFInput cname="项目编号" blockId="inqu_status" ename="projCode" row="0" colWidth="3"/>
+			<EF:EFInput cname="项目名称" blockId="inqu_status" ename="projName" row="0" colWidth="3"/>
+			<EF:EFInput cname="部件名称" blockId="inqu_status" ename="prdtName" row="0" colWidth="3"/>
+		    <EF:EFInput cname="生产计划单号" blockId="inqu_status" ename="planInfoNo" row="0" colWidth="3"/>
         </div>
+		<div class="row">
+			<EF:EFDatePicker cname="计划完成日期" blockId="inqu_status" ename="planCompletionDate" row="0" colWidth="3"
+			                 format="yyyy-MM-dd" readonly="true"/>
+			<EF:EFSelect cname="状态" blockId="inqu_status" ename="status" row="0" colWidth="3" optionLabel="全部">
+				<EF:EFOption label="未提交" value="0"/>
+				<EF:EFOption label="已提交" value="1"/>
+			</EF:EFSelect>
+		</div>
     </EF:EFRegion>
 
     <EF:EFRegion id="result" title="基本信息">