Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC008.java

@@ -42,14 +42,20 @@ import java.util.Objects;
  */
 public class ServiceHGKC008 extends ServiceBase {
 	
+	/**
+	 * 初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			inInfo = super.query(inInfo, HGKC008.QUERY, new HGKC008());
 			Map map = new HashMap();
 			map.put(HGKC008.FIELD_ACCOUNT_CODE, UserSessionUtils.getAccountCode());
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,
-			        DdynamicEnum.PROJ_RECORD_BY_ROLE_BLOCK_ID, DdynamicEnum.WH_RECORD_BLOCK_ID,
-			        DdynamicEnum.USER_BLOCK_ID), map, false
+					DdynamicEnum.PROJ_RECORD_BLOCK_ID, DdynamicEnum.PROJ_RECORD_BY_ROLE_BLOCK_ID,
+					DdynamicEnum.WH_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID), map, false
 			);
 			EiInfoUtils.addBlock(inInfo, "roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
         } catch (Exception e) {

src/main/webapp/HG/KC/HGKC008.jsp

@@ -14,12 +14,16 @@
     <EF:EFRegion id="inqu" title="查询条件">
 	    <div class="row">
 		    <EF:EFInput ename="inqu_status-0-companyName" cname="公司名称" colWidth="3"/>
+		    <EF:EFSelect ename="projCode" cname="项目名称" blockId="inqu_status" row="0" colWidth="3" optionLabel="全部"
+		                 filter="contains" template="#=valueField#-#=textField#">
+			    <EF:EFOptions blockId="projRecordByRole_block_id" textField="textField" valueField="valueField"/>
+		    </EF:EFSelect>
 		    <EF:EFDatePicker cname="单据日期" blockId="inqu_status" ename="receiptDate" row="0" colWidth="3"
 		                     role="date" format="yyyy-MM-dd" readonly="true"/>
 		    <EF:EFInput ename="inqu_status-0-applyCode" cname="生产领料单号" colWidth="3"/>
-		    <EF:EFInput ename="inqu_status-0-whName" cname="仓库名称" colWidth="3"/>
 	    </div>
 	    <div class="row">
+		    <EF:EFInput ename="inqu_status-0-whName" cname="仓库名称" colWidth="3"/>
 		    <EF:EFSelect ename="receiveUserId" cname="领料人" blockId="inqu_status" row="0" colWidth="3" filter="contains">
 			    <EF:EFOption label="全部" value=""/>
 			    <EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
@@ -40,13 +44,13 @@
 		<EF:EFGrid blockId="result" autoDraw="no" isFloat="true" copyToAdd="false">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/>
-			<EF:EFComboColumn cname="类型" ename="receiveType" width="90" align="center" required="false" enable="false">
+			<EF:EFComboColumn cname="类型" ename="receiveType" width="80" align="center" required="false" enable="false">
 				<EF:EFCodeOption codeName="hggp.receiveType"/>
 			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="companyCode" cname="公司名称"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#"
 			                  textField="textField" valueField="valueField"
-			                  maxLength="16" width="140" required="true"
+			                  maxLength="16" width="200" required="true"
 			                  align="center" filter="contains" sort="true">
 				<EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFComboColumn>