1.按月统计库存收发存

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC001.xml

@@ -172,8 +172,8 @@
 			WHERE ID = #id#
 	</update>
 
-    <!-- 按天统计 -->
-    <select id="statDay" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC001">
+    <!-- 统计库存 -->
+    <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC001">
         SELECT
             COMPANY_CODE AS "companyCode",
             DEP_CODE AS "depCode",

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC002.xml

@@ -170,8 +170,8 @@
 			WHERE ID = #id#
 	</update>
 
-    <!-- 按天统计 -->
-    <select id="statDay" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC002">
+    <!-- 统计库存 -->
+    <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC002">
         SELECT
             COMPANY_CODE AS "companyCode",
             DEP_CODE AS "depCode",

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC003.xml

@@ -173,8 +173,8 @@
 			ID = #id#
 	</update>
 
-    <!-- 按天统计 -->
-    <select id="statDay" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC003">
+    <!-- 统计库存 -->
+    <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC003">
         SELECT
             COMPANY_CODE AS "companyCode",
             DEP_CODE AS "depCode",

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC004.xml

@@ -247,8 +247,8 @@
 			ID = #id#
 	</update>
 
-    <!-- 按天统计 -->
-    <select id="statDay" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC004">
+    <!-- 统计库存 -->
+    <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC004">
         SELECT
             COMPANY_CODE AS "companyCode",
             DEP_CODE AS "depCode",

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC006.xml

@@ -120,8 +120,8 @@
 			ID = #id#
 	</update>
 
-    <!-- 按天统计 -->
-    <select id="statDay" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC006">
+    <!-- 统计库存 -->
+    <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC006">
         SELECT
             COMPANY_CODE AS "companyCode",
             DEP_CODE AS "depCode",

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC007.xml

@@ -163,8 +163,8 @@
 			ID = #id#
 	</update>
 
-    <!-- 按天统计 -->
-    <select id="statDay" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC007">
+    <!-- 统计库存 -->
+    <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC007">
         SELECT
             COMPANY_CODE AS "companyCode",
             DEP_CODE AS "depCode",

src/main/java/com/baosight/hpjx/util/DateUtils.java

@@ -27,6 +27,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	public static final DateTimeFormatter DATETIME = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 	public static final DateTimeFormatter SHORT_DATE = DateTimeFormatter.ofPattern("yyyyMMdd");
 	public static final DateTimeFormatter DATE = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+	public static final DateTimeFormatter SHORT_MONTH = DateTimeFormatter.ofPattern("yyyyMM");
 	public static final DateTimeFormatter YEAR_MONTH = DateTimeFormatter.ofPattern("yyyy-MM");
 	
 	/**

src/main/webapp/HP/KC/HPKC009.jsp

@@ -8,12 +8,16 @@
 <EF:EFPage title="库存收发存">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
-			<EF:EFDatePicker ename="inqu_status-0-dateProc" cname="日期:"
-			                 role="date" format="yyyy-MM-dd" readonly="true"/>
+			<EF:EFDatePicker ename="inqu_status-0-dateProc" cname="日期:" start="year" depth="year"
+			                 role="date" format="yyyy-MM" readonly="true"/>
 			<EF:EFSelect ename="inqu_status-0-inventType" cname="存货类型:" filter="contains" defaultValue="">
 				<EF:EFOption label="请选择" value=""/>
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFSelect>
+			<EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" filter="contains" defultValue="">
+				<EF:EFOption label="请选择" value=""/>
+				<EF:EFOptions blockId="whName_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 		</div>
 	</EF:EFRegion>
 
@@ -23,12 +27,9 @@
 			<EF:EFComboColumn cname="库存类型" ename="kcType" enable="false" width="80" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.kcType"/>
 			</EF:EFComboColumn>
-			<EF:EFComboColumn cname="日期类型" ename="dateType" enable="false" width="80" align="center">
-				<EF:EFCodeOption codeName="hpjx.hpkc.dateType"/>
-			</EF:EFComboColumn>
 			<EF:EFColumn cname="日期" ename="dateProc" enable="false" width="90" align="center"/>
 			<EF:EFComboColumn cname="仓库名称" ename="whCode" enable="false" columnTemplate="#=textField#"
-			                  itemTemplate="#=textField#" blockName="wh_record_block_id"
+			                  itemTemplate="#=textField#" blockName="whName_block_id"
 			                  textField="textField" valueField="valueField"
 			                  align="center" filter="contains" width="100">
 			</EF:EFComboColumn>