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

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG003B.java

@@ -46,7 +46,7 @@ public class ServiceHGCG003B extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BOX_BLOCK_ID),
 					new HashMap<String, Object>(){{
 						put(HGPZ005.FIELD_STATUS,1);
-						put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeSix());
+						put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
 					}}, false);
 			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG003B().eiMetadata);

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ005.xml

@@ -83,7 +83,7 @@
 			INVENT_CODE LIKE CONCAT('%', #inventCodeLike#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="spec">
-			SPEC = #spec#
+			SPEC  LIKE CONCAT('%', #spec#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="length">
 			LENGTH = #length#
@@ -147,6 +147,12 @@
 		<isNotEmpty prepend=" AND " property="inventTypeDetails">
 			INVENT_TYPE_DETAIL IN <iterate close=")" open="(" conjunction="," property="inventTypeDetails">#inventTypeDetails[]#</iterate>
 		</isNotEmpty>
+		<isEqual prepend=" AND " property="isFlowId" compareValue="1">
+			FLOW_ID > 0
+		</isEqual>
+		<isEqual prepend=" AND " property="isFlowId" compareValue="0">
+			FLOW_ID = #isFlowId#
+		</isEqual>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap" resultClass="HGPZ005">

src/main/webapp/HG/PZ/HGPZ005.js

@@ -71,6 +71,15 @@ $(function() {
 			template: function (options) {
 				return showUserName(options.updatedBy, options.updatedName);
 			}
+		}, {
+			field: "isFlowId",
+			template: function (options) {
+				let template = '未分配';
+				if (options.flowId>0){
+					template = '已分配';
+				}
+				return template;
+			}
 		}],
 		loadComplete: function(grid) {
 			// 此 grid 对象
@@ -272,25 +281,25 @@ function showFlowDetail(id,inventCode,flowId) {
 	});
 }
 
-function showFlowDetail() {
-	let rows = resultGrid.getCheckedRows();
-	let selectIds = [];
-	//selectIds.push(rows[i]['id']);
-	if (rows.length < 1) {
-		message("请选择数据")
-		return;
-	}
-	$.each(rows, function(index, item) {
-		selectIds.push(item.get("id"));
-	});
-	JSColorbox.open({
-		href: "HGPZ005B?methodName=initLoad&inqu_status-0-parentIds=" + selectIds,
-		title: "<div style='text-align: center;'>工艺流程</div>",
-		width: "75%",
-		height: "80%",
-		callbackName: cllback2
-	});
-}
+// function showFlowDetail() {
+// 	let rows = resultGrid.getCheckedRows();
+// 	let selectIds = [];
+// 	//selectIds.push(rows[i]['id']);
+// 	if (rows.length < 1) {
+// 		message("请选择数据")
+// 		return;
+// 	}
+// 	$.each(rows, function(index, item) {
+// 		selectIds.push(item.get("id"));
+// 	});
+// 	JSColorbox.open({
+// 		href: "HGPZ005B?methodName=initLoad&inqu_status-0-parentIds=" + selectIds,
+// 		title: "<div style='text-align: center;'>工艺流程</div>",
+// 		width: "75%",
+// 		height: "80%",
+// 		callbackName: cllback2
+// 	});
+// }
 
 /**
  * 回调

src/main/webapp/HG/PZ/HGPZ005.jsp

@@ -21,6 +21,13 @@
 				<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
 			</EF:EFSelect>
 		</div>
+		<div class="row">
+			<EF:EFInput cname="规格" ename="spec" blockId="inqu_status" row="0" colWidth="3"/>
+			<EF:EFSelect blockId="inqu_status" row="0" ename="isFlowId" cname="是否分配" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFCodeOption codeName="hggp.isFlowId"/>
+			</EF:EFSelect>
+		</div>
 	</EF:EFRegion>
 
 	<EF:EFRegion id="result" title="记录集">
@@ -45,6 +52,7 @@
 			<EF:EFComboColumn ename="status" cname="状态" align="center" width="80" required="true" defaultValue="1">
 				<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
 			</EF:EFComboColumn>
+			<EF:EFColumn ename="isFlowId" cname="是否分配" width="80" align="center"/>
 			<EF:EFColumn cname="创建人" ename="createdName" enable="false" align="center"/>
 			<EF:EFColumn cname="创建时间" ename="createdTime" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>

src/main/webapp/HG/YX/HGYX001.jsp

@@ -12,7 +12,7 @@
 
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
 
-<EF:EFPage  title="销售发货">
+<EF:EFPage  title="发货单">
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">

src/main/webapp/HG/YX/HGYX001A.jsp

@@ -12,7 +12,7 @@
 
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
 
-<EF:EFPage title="销售发货">
+<EF:EFPage title="发货单">
     <EF:EFRegion id="inqu" title="发货信息">
         <div class="row">
             <EF:EFInput blockId="inqu_status" row="0" ename="id" cname="ID" type="hidden" colWidth="3"/>

src/main/webapp/HG/YX/HGYX001B.jsp

@@ -12,7 +12,7 @@
 
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
 
-<EF:EFPage title="销售发货">
+<EF:EFPage title="发货单">
     <EF:EFRegion id="inqu" title="发货信息">
         <div class="row">
             <EF:EFInput blockId="inqu_status" row="0" ename="id" cname="ID" type="hidden" colWidth="3"/>

src/main/webapp/HG/ZL/HGZL004.js

@@ -122,6 +122,11 @@ function complete() {
 			flag = false;
 			return;
 		}
+		if(item.handleStatus==='2'){
+			message2("复检合格","【非处理中的数据】，无法进行复检操作！");
+			flag = false;
+			return;
+		}
 	});
 	if(flag) {
 		IPLAT.confirm({