整改通知单dev

src/main/java/com/baosight/hggp/common/HandleStatusEnum.java

@@ -7,7 +7,7 @@ package com.baosight.hggp.common;
 public enum HandleStatusEnum {
     UNPROCESS(0,"待处理"),
     processing(1,"处理中"),
-    processed(1,"已处理");
+    processed(2,"已处理");
     private Integer code;
 
     private String value;

src/main/java/com/baosight/hggp/hg/zl/domain/HGZL004.java

 package com.baosight.hggp.hg.zl.domain;
 
-import com.baosight.iplat4j.core.data.DaoEPBase;
-import com.baosight.iplat4j.core.ei.EiColumn;
 import com.baosight.iplat4j.core.util.NumberUtils;
-import com.baosight.iplat4j.core.util.StringUtils;
-
+import com.baosight.iplat4j.core.ei.EiColumn;
+import com.baosight.iplat4j.core.data.DaoEPBase;
 import java.util.HashMap;
 import java.util.Map;
+import com.baosight.iplat4j.core.util.StringUtils;
 
 /**
  * Project: <br>
@@ -16,7 +15,7 @@ import java.util.Map;
  * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
  *
  * @version 1.0
- * @history 2024-05-31 14:53:27 create
+ * @history 2024-06-03 11:12:42 create
  */
 public class HGZL004 extends DaoEPBase {
 
@@ -31,6 +30,7 @@ public class HGZL004 extends DaoEPBase {
 	public static final String FIELD_proj_code = "projCode";    		/* 项目编码*/
 	public static final String FIELD_proj_name = "projName";    		/* 项目名称*/
 	public static final String FIELD_handle_status = "handleStatus";    		/* 处理状态  0:待处理；1:处理中；2:已处理*/
+	public static final String FIELD_quality_problem = "qualityProblem";    		/* 质量问题*/
 	public static final String FIELD_process_sugges = "processSugges";    		/* 处理意见*/
 	public static final String FIELD_rectificat_sugges = "rectificatSugges";    		/* 整改措施*/
 	public static final String FIELD_check_type = "checkType";    		/* 质检单类型  1:工序质检单；2:日常巡检单*/
@@ -63,6 +63,7 @@ public class HGZL004 extends DaoEPBase {
 	public static final String COL_proj_code = "proj_code";    		/* 项目编码*/
 	public static final String COL_proj_name = "proj_name";    		/* 项目名称*/
 	public static final String COL_handle_status = "handle_status";    		/* 处理状态  0:待处理；1:处理中；2:已处理*/
+	public static final String COL_quality_problem = "quality_problem";    		/* 质量问题*/
 	public static final String COL_process_sugges = "process_sugges";    		/* 处理意见*/
 	public static final String COL_rectificat_sugges = "rectificat_sugges";    		/* 整改措施*/
 	public static final String COL_check_type = "check_type";    		/* 质检单类型  1:工序质检单；2:日常巡检单*/
@@ -91,8 +92,6 @@ public class HGZL004 extends DaoEPBase {
 	public static final String INSERT = "HGZL004.insert";
 	public static final String UPDATE = "HGZL004.update";
 	public static final String DELETE = "HGZL004.delete";
-	public static final String DELETE_BY_IDS = "HGZL004.deleteByIds";
-
 
 	private Long id = new Long(0);	
 	private Long checkId = new Long(0);	/* 质检单ID*/
@@ -103,6 +102,7 @@ public class HGZL004 extends DaoEPBase {
 	private String projCode = " ";		/* 项目编码*/
 	private String projName = " ";		/* 项目名称*/
 	private Integer handleStatus = new Integer(0);		/* 处理状态  0:待处理；1:处理中；2:已处理*/
+	private String qualityProblem = " ";		/* 质量问题*/
 	private String processSugges = " ";		/* 处理意见*/
 	private String rectificatSugges = " ";		/* 整改措施*/
 	private Integer checkType = new Integer(0);		/* 质检单类型  1:工序质检单；2:日常巡检单*/
@@ -169,6 +169,10 @@ public class HGZL004 extends DaoEPBase {
 		eiColumn.setDescName("处理状态  0:待处理；1:处理中；2:已处理");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_quality_problem);
+		eiColumn.setDescName("质量问题");
+		eiMetadata.addMeta(eiColumn);
+
 		eiColumn = new EiColumn(FIELD_process_sugges);
 		eiColumn.setDescName("处理意见");
 		eiMetadata.addMeta(eiColumn);
@@ -412,6 +416,22 @@ public class HGZL004 extends DaoEPBase {
 		this.handleStatus = handleStatus;
 	}
 	/**
+	 * get the qualityProblem - 质量问题.
+	 * @return the qualityProblem
+	 */
+	public String getQualityProblem() {
+		return this.qualityProblem;
+	}
+
+	/**
+	 * set the qualityProblem - 质量问题.
+	 *
+	 * @param qualityProblem - 质量问题
+	 */
+	public void setQualityProblem(String qualityProblem) {
+		this.qualityProblem = qualityProblem;
+	}
+	/**
 	 * get the processSugges - 处理意见.
 	 * @return the processSugges
 	 */
@@ -780,6 +800,7 @@ public class HGZL004 extends DaoEPBase {
 		setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_proj_code)), projCode));
 		setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_proj_name)), projName));
 		setHandleStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_handle_status)), handleStatus));
+		setQualityProblem(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_quality_problem)), qualityProblem));
 		setProcessSugges(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_process_sugges)), processSugges));
 		setRectificatSugges(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_rectificat_sugges)), rectificatSugges));
 		setCheckType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_check_type)), checkType));
@@ -820,6 +841,7 @@ public class HGZL004 extends DaoEPBase {
 		map.put(FIELD_proj_code, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_proj_code)));
 		map.put(FIELD_proj_name, StringUtils.toString(projName, eiMetadata.getMeta(FIELD_proj_name)));
 		map.put(FIELD_handle_status, StringUtils.toString(handleStatus, eiMetadata.getMeta(FIELD_handle_status)));
+		map.put(FIELD_quality_problem, StringUtils.toString(qualityProblem, eiMetadata.getMeta(FIELD_quality_problem)));
 		map.put(FIELD_process_sugges, StringUtils.toString(processSugges, eiMetadata.getMeta(FIELD_process_sugges)));
 		map.put(FIELD_rectificat_sugges, StringUtils.toString(rectificatSugges, eiMetadata.getMeta(FIELD_rectificat_sugges)));
 		map.put(FIELD_check_type, StringUtils.toString(checkType, eiMetadata.getMeta(FIELD_check_type)));

src/main/java/com/baosight/hggp/hg/zl/service/ServiceHGZL004.java

+package com.baosight.hggp.hg.zl.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.core.security.UserSessionUtils;
+import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.zl.domain.HGZL004;
+import com.baosight.hggp.util.EiInfoUtils;
+import com.baosight.hggp.util.LogUtils;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.service.impl.ServiceBase;
+
+
+
+/**
+ * @author wwl
+ * @date 2025年05月29日 17:18
+ */
+public class ServiceHGZL004 extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@Override
+	@OperationLogAnnotation(operModul = "整改通知单", operType = "查询", operDesc = "初始化查询")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			inInfo = super.query(inInfo, HGZL004.QUERY, new HGZL004());
+			EiInfoUtils.addBlock(inInfo,"userBlockId", UserSessionUtils.getUser(), User.class);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+	
+	/**
+	 * 查询操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@Override
+	@OperationLogAnnotation(operModul = "整改通知单", operType = "查询", operDesc = "查询")
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			inInfo = super.query(inInfo, HGZL004.QUERY, new HGZL004());
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+
+
+}

src/main/java/com/baosight/hggp/hg/zl/sql/HGZL004.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sqlMap  PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">	<!--      table information
-		Generate time : 2024-05-31 14:53:27
+		Generate time : 2024-06-03 11:12:42
    		Version :  1.0
 		schema : hggp
 		tableName : HGZL004
@@ -13,6 +13,7 @@
 		 proj_code  VARCHAR, 
 		 proj_name  VARCHAR, 
 		 handle_status  TINYINT, 
+		 quality_problem  VARCHAR, 
 		 process_sugges  VARCHAR, 
 		 rectificat_sugges  VARCHAR, 
 		 check_type  TINYINT, 
@@ -58,14 +59,17 @@
 			dep_name = #depName#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projCode">
-			proj_code = #projCode#
+			proj_code like ('%$projCode$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			proj_name = #projName#
+			proj_name like ('%$projName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="handleStatus">
 			handle_status = #handleStatus#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="qualityProblem">
+			quality_problem = #qualityProblem#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="processSugges">
 			process_sugges = #processSugges#
 		</isNotEmpty>
@@ -85,7 +89,7 @@
 			product_code = #productCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="productName">
-			product_name = #productName#
+			product_name like ('%$productName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="factoryCode">
 			factory_code = #factoryCode#
@@ -109,7 +113,7 @@
 			check_by = #checkBy#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="checkName">
-			check_name = #checkName#
+			check_name like ('%$checkName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="accountCode">
 			account_code = #accountCode#
@@ -146,6 +150,7 @@
 				proj_code	as "projCode",  <!-- 项目编码 -->
 				proj_name	as "projName",  <!-- 项目名称 -->
 				handle_status	as "handleStatus",  <!-- 处理状态  0:待处理；1:处理中；2:已处理 -->
+				quality_problem	as "qualityProblem",  <!-- 质量问题 -->
 				process_sugges	as "processSugges",  <!-- 处理意见 -->
 				rectificat_sugges	as "rectificatSugges",  <!-- 整改措施 -->
 				check_type	as "checkType",  <!-- 质检单类型  1:工序质检单；2:日常巡检单 -->
@@ -175,7 +180,7 @@
     		  $orderBy$
 			</isNotEmpty>
 			<isEmpty property="orderBy">
-    		  id asc
+    		  id desc
 			</isEmpty>
 		</dynamic>
 
@@ -214,6 +219,9 @@
 		<isNotEmpty prepend=" AND " property="handleStatus">
 			handle_status = #handleStatus#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="qualityProblem">
+			quality_problem = #qualityProblem#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="processSugges">
 			process_sugges = #processSugges#
 		</isNotEmpty>
@@ -292,6 +300,7 @@
 										proj_code,  <!-- 项目编码 -->
 										proj_name,  <!-- 项目名称 -->
 										handle_status,  <!-- 处理状态  0:待处理；1:处理中；2:已处理 -->
+										quality_problem,  <!-- 质量问题 -->
 										process_sugges,  <!-- 处理意见 -->
 										rectificat_sugges,  <!-- 整改措施 -->
 										check_type,  <!-- 质检单类型  1:工序质检单；2:日常巡检单 -->
@@ -315,7 +324,7 @@
 										updated_name,  <!-- 修改人名称 -->
 										updated_time  <!-- 更新时间 -->
 										)
-	    VALUES (#id#, #checkId#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #handleStatus#, #processSugges#, #rectificatSugges#, #checkType#, #checkCode#, #productType#, #productCode#, #productName#, #factoryCode#, #factoryName#, #groupCode#, #groupName#, #workBy#, #workName#, #checkBy#, #checkName#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#)
+	    VALUES (#id#, #checkId#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #handleStatus#, #qualityProblem#, #processSugges#, #rectificatSugges#, #checkType#, #checkCode#, #productType#, #productCode#, #productName#, #factoryCode#, #factoryName#, #groupCode#, #groupName#, #workBy#, #workName#, #checkBy#, #checkName#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#)
 	</insert>
 
 	<delete id="delete">
@@ -323,11 +332,6 @@
 			id = #id#
 	</delete>
 
-	<delete id="deleteByIds">
-		DELETE FROM ${hggpSchema}.HGZL004 WHERE
-		id IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
-	</delete>
-
 	<update id="update">
 		UPDATE ${hggpSchema}.HGZL004
 		SET
@@ -339,6 +343,7 @@
 					proj_code	= #projCode#,   <!-- 项目编码 -->
 					proj_name	= #projName#,   <!-- 项目名称 -->
 					handle_status	= #handleStatus#,   <!-- 处理状态  0:待处理；1:处理中；2:已处理 -->
+					quality_problem	= #qualityProblem#,   <!-- 质量问题 -->
 					process_sugges	= #processSugges#,   <!-- 处理意见 -->
 					rectificat_sugges	= #rectificatSugges#,   <!-- 整改措施 -->
 					check_type	= #checkType#,   <!-- 质检单类型  1:工序质检单；2:日常巡检单 -->

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

+$(function () {
+	IPLATUI.EFGrid = {
+		"result": {
+			pageable: {
+				input: true,
+				numeric: false,
+				pageSize: 20,
+				pageSizes: [10, 20, 30, 50, 100, 200]
+			},
+			columns: [{
+				field: "operator",
+				template: function (item) {
+					let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
+						'onclick="communication(' + item.id + ')" >沟通记录</a>';
+					return template;
+				}
+			},{
+				field: "problemPic",
+				template: function (item) {
+					let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
+						'onclick="showUploadFile(' + item.id + ',\'CHECK_DEFECT\',\'问题照片\')" >问题照片</a>';
+					return template;
+				}
+			},{
+				field: "processPic",
+				template: function (item) {
+					let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
+						'onclick="showUploadFile(' + item.id + ',\'CHECK_HANDLE\',\'处理照片\')" >处理照片</a>';
+					return template;
+				}
+			}],
+			onSuccess: function (e) {
+			},
+			loadComplete: function(grid) {
+
+			},
+			onSave: function(e){
+				// 阻止默认请求，使用自定义保存
+				e.preventDefault();
+				let btnNode = $(this);
+				//禁用按钮
+				btnNode.attr("disabled", true);
+				save(btnNode);
+			}
+		}
+	}
+	// 查询
+	$("#QUERY").on("click", query);
+});
+
+
+/**
+ * 查询
+ */
+let query = function () {
+	resultGrid.dataSource.page(1);
+}
+
+
+/**
+ * 提交操作
+ *
+ * @param id
+ * @param checkNo
+ */
+let save = function () {
+	let rows = resultGrid.getCheckedRows();
+	if (rows.length < 1) {
+		message("请选择数据")
+		return;
+	}
+	for (let i = 0; i < rows.length; i++) {
+		let passQuantity = rows[i]['passQuantity'];
+		let unpassQuantity = rows[i]['unpassQuantity'];
+		let quantity = rows[i]['quantity'];
+
+		if (!isNumber(passQuantity)||!isNumber(unpassQuantity)) {
+			message("第" + (i + 1) + "行合格数量与不合格数量必须是大于等于0的数字！");
+			return;
+		}
+		if (passQuantity > quantity) {
+			message("第" + (i + 1) + "行合格数量不能大于报工数量！");
+			return;
+		}
+		if (unpassQuantity > quantity) {
+			message("第" + (i + 1) + "行不合格数量不能大于报工数量！");
+			return;
+		}
+	}
+	JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做质检完成操作吗?  ", {
+		ok: function () {
+			JSUtils.submitGridsData("result", "HGZL002", "save", true);
+		}
+	});
+}
+
+
+/**
+ * 显示附件清单
+ *
+ * @param id
+ */
+function showUploadFile(id,bizType,title) {
+	JSColorbox.open({
+		href: "HGSC099?methodName=initLoad&inqu_status-0-bizType="+bizType+"&inqu_status-0-matId=" + id,
+		title: "<div style='text-align: center;'>"+title+"</div>",
+		width: "80%",
+		height: "80%",
+	});
+}

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

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+
+<EF:EFPage  title="整改通知单">
+    <EF:EFRegion id="inqu" title="查询条件">
+	    <div class="row">
+			<EF:EFInput blockId="inqu_status" row="0" ename="projCode" cname="项目编号" placeholder="模糊查询" colWidth="3"/>
+			<EF:EFInput blockId="inqu_status" row="0" ename="projName" cname="项目名称" placeholder="模糊查询" colWidth="3"/>
+			<EF:EFInput blockId="inqu_status" row="0" ename="productName" cname="产品名称" placeholder="模糊查询" colWidth="3"/>
+			</div>
+	    <div class="row">
+			<EF:EFInput blockId="inqu_status" row="0" ename="chekcName" cname="质检人" placeholder="模糊查询" colWidth="3"/>
+			<EF:EFSelect cname="处理状态" ename="handleStatus" blockId="inqu_status" row="0" colWidth="3">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFCodeOption codeName="hggp.handleStatus" />
+		    </EF:EFSelect>
+	    </div>
+    </EF:EFRegion>
+
+	<EF:EFRegion id="result" title="明细信息">
+		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
+			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
+			<EF:EFColumn ename="checkBy" cname="质检员" hidden="true"/>
+			<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="companyName" cname="公司名称" width="130" enable="false" readonly="true" align="center"/>
+			<EF:EFColumn ename="projCode" cname="项目编号" width="130" enable="false" readonly="true" align="center"/>
+			<EF:EFColumn ename="projName" cname="项目名称" width="130" enable="false" readonly="true" align="center"/>
+			<EF:EFColumn ename="createdTime" cname="单据日期" editType="date"
+						 dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" enable="true" width="120" align="center" readOnly="true"/>
+			<EF:EFColumn ename="checkCode" cname="检查单号" width="130" enable="false" readonly="true" align="center"/>
+			<EF:EFColumn ename="checkName" cname="质检人" width="100" enable="false" readonly="true" align="center"/>
+			<EF:EFColumn ename="groupName" cname="责任部门" width="100" enable="false" readonly="true" align="center"/>
+			<EF:EFColumn ename="workName" cname="姓名" width="90" enable="false" readonly="true" align="center"/>
+			<EF:EFColumn ename="productName" cname="产品名称" width="90" enable="false" readonly="true" align="center"/>
+			<EF:EFColumn ename="qualityProblem" cname="质量问题描述" width="130" enable="false" readonly="true" align="center"/>
+			<EF:EFColumn ename="problemPic" cname="问题照片" width="90" enable="false" align="center"/>
+			<EF:EFColumn ename="processPic" cname="处理照片" width="90" enable="false" align="center"/>
+			<EF:EFColumn ename="processSugges" cname="处理意见" width="130" enable="false" readonly="true" align="center"/>
+			<EF:EFColumn ename="rectificatSugges" cname="整改措施" width="130" enable="false" readonly="true" align="center"/>
+			<EF:EFComboColumn ename="handleStatus" cname="处理状态" width="80" align="center" enable="false"
+							  readonly="true">
+				<EF:EFCodeOption codeName="hggp.handleStatus"/>
+			</EF:EFComboColumn>
+		</EF:EFGrid>
+	</EF:EFRegion>
+</EF:EFPage>