生产入库单问题处理

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

@@ -56,8 +56,8 @@ public class ServiceHGKC003 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "生产入库单", operType = "查询", operDesc = "查询")
 	public EiInfo query(EiInfo inInfo) {
 		try {
-			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
-			HGKCUtils.HgKc003.setCondition(queryRow);
+//			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+//			HGKCUtils.HgKc003.setCondition(queryRow);
 			inInfo = super.query(inInfo, HGKC003.QUERY, new HGKC003());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC003.xml

@@ -62,19 +62,19 @@
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyName">
-			COMPANY_NAME like '%' ||  #companyName#|| '%'
+			COMPANY_NAME like ('%$companyName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="depositDate">
-			DEPOSIT_DATE = #depositDate#
+			date_format(DEPOSIT_DATE,'%Y-%m-%d') = #depositDate#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="depositNo">
-			DEPOSIT_NO like '%' || #depositNo# || '%'
+			DEPOSIT_NO like ('%$depositNo$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="whCode">
 			WH_CODE = #whCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="whName">
-			WH_NAME = #whName#
+			WH_NAME like ('%$whName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="depositNoOld">
 			DEPOSIT_NO_OLD = #depositNoOld#
@@ -95,7 +95,7 @@
 			PROJ_CODE = #projCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME like '%' ||  #projName# || '%'
+			PROJ_NAME like ('%$projName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="prdtType">
 			PRDT_TYPE = #prdtType#
@@ -151,9 +151,6 @@
         <isNotEmpty prepend=" AND " property="id">
             ID = #id#
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="depositNo">
-            DEPOSIT_NO = #depositNo#
-        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="depositNos">
             DEPOSIT_NO IN <iterate open="(" close=")" conjunction="," property="depositNos">#depositNos[]#</iterate>
         </isNotEmpty>

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC003A.xml

@@ -37,13 +37,13 @@
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyName">
-			COMPANY_NAME = #companyName#
+			COMPANY_NAME like ('%$companyName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="depositDate">
-			DEPOSIT_DATE = #depositDate#
+			date_format(DEPOSIT_DATE,'%Y-%m-%d') = #depositDate#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="depositNo">
-			DEPOSIT_NO = #depositNo#
+			DEPOSIT_NO like ('%$depositNo$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="whCode">
 			WH_CODE = #whCode#
@@ -79,7 +79,7 @@
 			PROJ_CODE = #projCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME = #projName#
+			PROJ_NAME like ('%$projName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="prdtType">
 			PRDT_TYPE = #prdtType#
@@ -144,7 +144,7 @@
 			resultClass="com.baosight.hggp.hg.kc.domain.HGKC003A">
 		SELECT
 				ID	as "id",
-				QUALITY_DETAIL_ID	as "qualityDetailId",<!-- 企业编码 -->
+				QUALITY_DETAIL_ID	as "qualityDetailId",<!-- 质检单明细ID -->
 				ACCOUNT_CODE	as "accountCode",  <!-- 企业编码 -->
 				DEP_CODE	as "depCode",  <!-- 部门编码 -->
 				CREATED_BY	as "createdBy",  <!-- 记录创建者 -->

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

@@ -8,19 +8,14 @@
 <EF:EFPage title="生产入库单">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
-			<EF:EFInput cname="公司名称" ename="companyName" blockId="inqu_status" row="0" colWidth="3"/>
-			<EF:EFDatePicker cname="单据日期" ename="depositDate" blockId="inqu_status" row="0" colWidth="3"
-			                 format="yyyy-MM-dd" readonly="true"/>
-			<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3"/>
-			<EF:EFInput cname="生产入库单号" ename="projName" blockId="inqu_status" row="0" colWidth="3"/>
-
+			<EF:EFInput ename="inqu_status-0-companyName" cname="公司名称" colWidth="3"/>
+			<EF:EFDatePicker cname="单据日期" blockId="inqu_status" ename="depositDate" row="0" colWidth="3"
+							 role="date" format="yyyy-MM-dd" readonly="true"/>
+			<EF:EFInput ename="inqu_status-0-projName" cname="项目名称" colWidth="3"/>
+			<EF:EFInput ename="inqu_status-0-depositNo" cname="生产入库单号" colWidth="3"/>
 		</div>
 		<div class="row">
-			<EF:EFSelect cname="仓库名称" ename="whCode" blockId="inqu_status" row="0" colWidth="3"
-						 filter="contains" defultValue="">
-				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
-			</EF:EFSelect>
+			<EF:EFInput ename="inqu_status-0-whName" cname="仓库名称" colWidth="3"/>
 		</div>
 	</EF:EFRegion>
 
@@ -34,7 +29,6 @@
 			<EF:EFColumn ename="depositDate" cname="单据日期" enable="false" width="100" align="center" editType="date"
 						 dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
 			<EF:EFColumn ename="depositNo" cname="生产入库单号" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="prodOrderNo" cname="生产任务单号" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="whName" cname="仓库名称" enable="false" width="120" align="center"/>
 			<EF:EFComboColumn cname="提交状态" ename="submitStatus" width="90" align="center" required="false">
 				<EF:EFCodeOption codeName="hggp.sc.productStatus" />

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

@@ -9,12 +9,7 @@
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
 			<EF:EFInput ename="inqu_status-0-primaryId" cname="主表id" colWidth="3" type="hidden"/>
-			<EF:EFSelect cname="仓库名称" ename="whCode" blockId="inqu_status" row="0" colWidth="3"
-			             filter="contains" defultValue="">
-				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
-			</EF:EFSelect>
-			<EF:EFInput cname="存货编码" ename="prdtCode" blockId="inqu_status" row="0" colWidth="3"/>
+			<EF:EFInput ename="inqu_status-0-whName" cname="仓库名称" colWidth="3"/>
 			<EF:EFInput cname="存货名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3"/>
 		</div>
 	</EF:EFRegion>