Merge remote-tracking branch 'origin/dev' into dev

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

@@ -18,6 +18,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
+import org.apache.commons.collections.CollectionUtils;
 
 import java.util.HashMap;
 import java.util.List;
@@ -40,11 +41,13 @@ public class ServiceHPSC002A extends ServiceEPBase {
 			// 查询物料ID所对应的项目名称和产品名称
 			Map queryMap = EiInfoUtils.getFirstRow(inInfo);
 			List<HPSC002> dbSc002s = dao.query("HPSC002.query", queryMap);
-			HPSC002 dbSc002 = dbSc002s.get(0);
-			inInfo.set("inqu_status-0-matId", queryMap.get("id"));
-			inInfo.set("inqu_status-0-projName", dbSc002.getProjName());
-			inInfo.set("inqu_status-0-prdtName", dbSc002.getPrdtName());
-			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC002A().eiMetadata);
+			if (CollectionUtils.isNotEmpty(dbSc002s)) {
+				HPSC002 dbSc002 = dbSc002s.get(0);
+				inInfo.set("inqu_status-0-matId", queryMap.get("id"));
+				inInfo.set("inqu_status-0-projName", dbSc002.getProjName());
+				inInfo.set("inqu_status-0-prdtName", dbSc002.getPrdtName());
+				inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC002A().eiMetadata);
+			}
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}

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

@@ -2,6 +2,7 @@ package com.baosight.hpjx.hp.sc.service;
 
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.sc.domain.HPSC002;
+import com.baosight.hpjx.hp.sc.domain.HPSC002A;
 import com.baosight.hpjx.hp.sc.domain.HPSC002B;
 import com.baosight.hpjx.util.EiInfoUtils;
 import com.baosight.hpjx.util.LogUtils;
@@ -9,6 +10,7 @@ import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
+import org.apache.commons.collections.CollectionUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -30,11 +32,13 @@ public class ServiceHPSC002B extends ServiceEPBase {
 			// 查询物料ID所对应的项目名称和产品名称
 			Map queryMap = EiInfoUtils.getFirstRow(inInfo);
 			List<HPSC002> dbSc002s = dao.query("HPSC002.query", queryMap);
-			HPSC002 dbSc002 = dbSc002s.get(0);
-			inInfo.set("inqu_status-0-matId", queryMap.get("id"));
-			inInfo.set("inqu_status-0-projName", dbSc002.getProjName());
-			inInfo.set("inqu_status-0-prdtName", dbSc002.getPrdtName());
-			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC002B().eiMetadata);
+			if (CollectionUtils.isNotEmpty(dbSc002s)) {
+				HPSC002 dbSc002 = dbSc002s.get(0);
+				inInfo.set("inqu_status-0-matId", queryMap.get("id"));
+				inInfo.set("inqu_status-0-projName", dbSc002.getProjName());
+				inInfo.set("inqu_status-0-prdtName", dbSc002.getPrdtName());
+				inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC002A().eiMetadata);
+			}
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}

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

@@ -51,6 +51,9 @@
 		<isNotEmpty prepend=" AND " property="updatedTime">
             A.UPDATED_TIME = #updatedTime#
 		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="updatedTime">
+            B.DOC_NAME LIKE ('%$updatedTime$%')
+        </isNotEmpty>
 	</sql>
 
     <sql id="customCondition">

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

@@ -9,7 +9,7 @@
     <EF:EFRegion id="inqu" title="查询条件">
 	    <div class="row">
 		    <EF:EFDatePicker ename="inqu_status-0-documentDate" cname="单据日期" colWidth="3" format="yyyy-MM-dd"
-		                     readonly="true"/>
+		                     />
 		    <EF:EFInput ename="inqu_status-0-prodNo" cname="生产入库单号" colWidth="3"/>
 		    <EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" colWidth="3" filter="contains" defultValue="">
 			    <EF:EFOption label="请选择" value=""/>

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

@@ -11,6 +11,7 @@
 		<div class="row">
 			<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
 			<EF:EFInput cname="产品名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
+			<EF:EFInput cname="文件名称" ename="docName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
 			<EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
 			               startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
 			               format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
@@ -21,7 +22,7 @@
 	<EF:EFRegion id="result" title="记录集">
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="ID" hidden="true"/>
-			<EF:EFColumn ename="docId" cname="文件ID" enable="false" width="150"/>
+<%--			<EF:EFColumn ename="docId" cname="文件ID" enable="false" width="150"/>--%>
 			<EF:EFColumn ename="docName" cname="文件名称" enable="false" width="150"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"
 			             parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss"/>

src/main/webapp/HP/SC/HPSC098.js

@@ -22,7 +22,7 @@ $(function () {
             return;
         }
         let row = rows[0];
-        JSUtils.confirm("确定\"保存\"操作? ", {
+        JSUtils.confirm("确定\"是否\"分派? ", {
             ok: function () {
                 parent.JSColorbox.setValueCallback(row.orgId);
             }