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

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

@@ -179,7 +179,13 @@ public enum DdynamicEnum {
                 put("orgTypes",new String[]{OrgTypeEnum.COMPANY.getCode(),OrgTypeEnum.FACTORY.getCode()});
             }}
     ),
-    DEVICE_CODE_BOX_BLOCK_ID("deviceCodeBox_block_id","deviceCode","deviceName","deviceType","HGSB001.queryDeviceCodeBox"),
+
+    /**
+     * 模块：设备台账编码
+     * 用途：设备名称下拉框
+     * 编写：ly
+     */
+    DEVICE_CODE_BOX_BLOCK_ID("deviceCodeBox_block_id","deviceCode","deviceName","deviceType", "companyCode","HGSB001.queryDeviceCodeBox"),
     ;
 
 

src/main/java/com/baosight/hggp/hg/constant/HGConstant.java

@@ -85,6 +85,10 @@ public class HGConstant {
 		public static final String DEVICE_CODE = "DEVICE_CODE";
 		//计划单号
 		public static final String PLAN_CODE = "PLAN_CODE";
+		// 计划号
+		public static final String PLAN_NO = "PLAN_NO";
+		//申请单号
+		public static final String APPLY_CODE = "APPLY_CODE";
 		// 采购计划号
 		public static final String CG_PLAN_NO = "CG_PLAN_NO";
 		// 采购合同号

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB003.java

+package com.baosight.hggp.hg.sb.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.core.constant.CommonConstant;
+import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.sb.domain.HGSB003;
+import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.ErrorCodeUtils;
+import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.StringUtil;
+import com.baosight.hggp.util.contants.ACConstants;
+import com.baosight.iplat4j.core.ei.EiBlock;
+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.resource.I18nMessages;
+import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
+import com.baosight.iplat4j.ed.util.SequenceGenerator;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author LiuYang
+ * @version 1.0 2024/5/10
+ */
+public class ServiceHGSB003 extends ServiceEPBase {
+
+    @Override
+    public EiInfo initLoad(EiInfo inInfo) {
+        inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
+        inInfo = super.query(inInfo, HGSB003.QUERY, new HGSB003());
+        CommonMethod.initBlock(inInfo,
+                Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,
+                        DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID,
+                        DdynamicEnum.USER_BLOCK_ID),
+                new HashMap<String,Object>(){{
+                    put(HGSB003.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);}}
+        );
+        return inInfo;
+    }
+
+    @Override
+    public EiInfo query(EiInfo inInfo) {
+        EiBlock block = inInfo.getBlock(EiConstant.queryBlock);
+        block.setCell(ACConstants.ROW_CODE_0, HGSB003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
+        String applyDate = block.getCellStr(ACConstants.ROW_CODE_0,HGSB003.FIELD_APPLY_DATE);
+        if (!applyDate.isEmpty()) {
+            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSB003.FIELD_APPLY_DATE, StringUtil.removeHorizontalLine(applyDate));
+        }
+        return super.query(inInfo,HGSB003.QUERY,new HGSB003());
+    }
+
+    @OperationLogAnnotation(operModul = "设备维修申请",operType = "删除",operDesc = "删除操作")
+    @Override
+    public EiInfo delete(EiInfo inInfo) {
+        int i = 0;
+        try {
+            HGSB003 hgsb003 = new HGSB003();
+            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
+            for (i = 0; i < eiBlock.getRowCount(); i++) {
+                Map<?, ?> map = eiBlock.getRow(i);
+                hgsb003.fromMap(map);
+                hgsb003.setDeleteFlag(CommonConstant.YesNo.YES_1);
+                DaoUtils.update(HGSB003.DELETE_FLAG, hgsb003.toMap());
+            }
+            inInfo.setStatus(EiConstant.STATUS_SUCCESS);
+            inInfo.setMsgByKey("ep.1000", new String[]{String.valueOf(i), I18nMessages.getText("label.delete", "删除")});
+        } catch (PlatException e) {
+            e.printStackTrace();
+            inInfo.setStatus(EiConstant.STATUS_FAILURE);
+            ErrorCodeUtils.handleDeleteException(inInfo,i,e);
+            logError("删除失败", e.getMessage());
+            return inInfo;
+        }
+        return inInfo;
+    }
+
+    /**
+     * 保存操作
+     */
+    @OperationLogAnnotation(operModul = "设备维修申请",operType = "保存",operDesc = "保存操作")
+    public EiInfo save(EiInfo inInfo) {
+        try {
+            List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+            // 写入数据
+            for (Map resultRow : resultRows) {
+                HGSB003 hgsb003 = new HGSB003();
+                hgsb003.fromMap(resultRow);
+                if (hgsb003.getId() == null || hgsb003.getId() == 0) {
+                    this.add(hgsb003);
+                } else {
+                    this.modify(hgsb003);
+                }
+            }
+            inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+            inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
+        } catch (Exception e) {
+            LogUtils.setDetailMsg(inInfo, e, "保存失败");
+        }
+        return inInfo;
+    }
+
+    /**
+     * 新增操作
+     */
+    public void add(HGSB003 hgsb003) {
+        //生成申请单号
+        hgsb003.setApplyCode(SequenceGenerator.getNextSequence(HGConstant.SequenceId.APPLY_CODE));
+        DaoUtils.insert(HGSB003.INSERT, hgsb003);
+    }
+
+    /**
+     * 修改操作
+     */
+    public void modify(HGSB003 hgsb003) {
+        DaoUtils.update(HGSB003.UPDATE, hgsb003);
+    }
+
+    @OperationLogAnnotation(operModul = "设备申请维修",operType = "修改",operDesc = "修改状态操作")
+    public EiInfo updateStatus(EiInfo inInfo){
+        int i = 0;
+        try {
+            HGSB003 hgsb003 = new HGSB003();
+            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
+            for (i = 0; i < eiBlock.getRowCount(); i++) {
+                Map<?, ?> map = eiBlock.getRow(i);
+                hgsb003.fromMap(map);
+                DaoUtils.update(HGSB003.UPDATE_STATUS, hgsb003);
+            }
+            inInfo.setStatus(EiConstant.STATUS_SUCCESS);
+            inInfo.setMsgByKey("ep.1000", new String[]{String.valueOf(i), I18nMessages.getText("label.update", "修改")});
+        } catch (PlatException e) {
+            e.printStackTrace();
+            inInfo.setStatus(EiConstant.STATUS_FAILURE);
+            ErrorCodeUtils.handleUpdateException(inInfo,i,e);
+            logError("修改失败", e.getMessage());
+            return inInfo;
+        }
+        return inInfo;
+    }
+
+    @OperationLogAnnotation(operModul = "设备申请维修",operType = "上传附件",operDesc = "上传附件操作")
+    public EiInfo updateDocId(EiInfo inInfo){
+        int i = 0;
+        try {
+            HGSB003 hgsb003 = new HGSB003();
+            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
+            for (i = 0; i < eiBlock.getRowCount(); i++) {
+                Map<?, ?> map = eiBlock.getRow(i);
+                hgsb003.fromMap(map);
+                DaoUtils.update(HGSB003.UPDATE_DOC_ID, hgsb003);
+            }
+            inInfo.setStatus(EiConstant.STATUS_SUCCESS);
+            inInfo.setMsgByKey("ep.1000", new String[]{String.valueOf(i), I18nMessages.getText("label.update", "修改")});
+        } catch (PlatException e) {
+            e.printStackTrace();
+            inInfo.setStatus(EiConstant.STATUS_FAILURE);
+            ErrorCodeUtils.handleUpdateException(inInfo,i,e);
+            logError("修改失败", e.getMessage());
+            return inInfo;
+        }
+        return inInfo;
+    }
+}

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB003A.java

+package com.baosight.hggp.hg.sb.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
+
+/**
+ * @author LiuYang
+ * @version 1.0 2024/5/10
+ */
+public class ServiceHGSB003A extends ServiceEPBase {
+
+    /**
+     * 画面初始化.
+     */
+    @OperationLogAnnotation(operModul = "附件上传",operType = "查询",operDesc = "初始化")
+    @Override
+    public EiInfo initLoad(EiInfo inInfo) {
+        return inInfo;
+    }
+
+
+    /**
+     * 附件上传.
+     */
+    @OperationLogAnnotation(operModul = "附件上传",operType = "上传",operDesc = "附件上传")
+    public EiInfo form(EiInfo inInfo) {
+        return inInfo;
+    }
+}

src/main/java/com/baosight/hggp/hg/sb/sql/HGSB001.xml

@@ -344,7 +344,8 @@
 		SELECT distinct
 			DEVICE_CODE	as "deviceCode",  <!-- 设备编码 -->
 			DEVICE_NAME	as "deviceName",  <!-- 设备名称 -->
-			DEVICE_TYPE	as "deviceType"  <!-- 设备类型 -->
+			DEVICE_TYPE	as "deviceType",  <!-- 设备类型 -->
+			COMPANY_CODE	as "companyCode"
 		FROM ${hggpSchema}.HGSB001 WHERE 1=1
 		<include refid="condition" />
 	</select>

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ001.java

@@ -4,9 +4,9 @@ import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoUtils;
-import com.baosight.hggp.core.enums.OrgTypeEnum;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.sj.domain.HGSJ001;
+import com.baosight.hggp.util.AssertUtils;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.ErrorCodeUtils;
 import com.baosight.hggp.util.LogUtils;
@@ -80,12 +80,13 @@ public class ServiceHGSJ001 extends ServiceEPBase {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
             // 写入数据
             for (int i = 0; i < resultRows.size(); i++) {
-                HGSJ001 hpsc012 = new HGSJ001();
-                hpsc012.fromMap(resultRows.get(i));
-                if (hpsc012.getId() == null || hpsc012.getId() == 0) {
-                    this.add(hpsc012);
+                HGSJ001 hpsj001 = new HGSJ001();
+                hpsj001.fromMap(resultRows.get(i));
+                queryDeviceCode(hpsj001);
+                if (hpsj001.getId() == null || hpsj001.getId() == 0) {
+                    this.add(hpsj001);
                 } else {
-                    this.modify(hpsc012);
+                    this.modify(hpsj001);
                 }
             }
             inInfo = this.query(inInfo);
@@ -134,4 +135,16 @@ public class ServiceHGSJ001 extends ServiceEPBase {
         }
         return inInfo;
     }
+
+    /**
+     * 工序重复校验
+     * @param hgsj001  工序设置
+     */
+    public void queryDeviceCode(HGSJ001 hgsj001){
+        Map<String,Object> map = new HashMap<>();
+        map.put("processName",hgsj001.getProcessName().trim());
+        map.put(HGSJ001.FIELD_DELETE_FLAG,hgsj001.getDeleteFlag());
+        List<HGSJ001> hgsj001s = this.dao.query(HGSJ001.QUERY,map);
+        AssertUtils.isNotEmpty(hgsj001s, String.format("工序名称[%s]已存在,添加失败！", hgsj001.getProcessName()));
+    }
 }

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ002A.java

@@ -38,7 +38,7 @@ public class ServiceHGSJ002A extends ServiceEPBase {
         CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),null);
         CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROCESS_CODE_BLOCK_ID),
                 new HashMap<String,Object>(){{
-                    put(HGSJ002A.FIELD_FACTORY_CODE,factoryCode);
+                    //put(HGSJ002A.FIELD_FACTORY_CODE,factoryCode);
                     put(HGSJ002A.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);}}
         );
         return inInfo;

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ003.java

@@ -196,8 +196,9 @@ public class ServiceHGSJ003 extends ServiceEPBase {
         Map map = HGSJTools.Hgsj003.getCompany(UserSession.getLoginName(),OrgTypeEnum.COMPANY.getCode());
         param.put(HGSJ003.FIELD_FACTORY_CODE, map.get("orgEname"));
         param.put(HGSJ003.FIELD_FACTORY_NAME, map.get("orgCname"));
-        param.put("orgType", OrgTypeEnum.COMPANY.getCode());
-        param.put("loginName",UserSession.getLoginName());
+        param.put(HGSJ003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
+        //param.put("orgType", OrgTypeEnum.COMPANY.getCode());
+        //param.put("loginName",UserSession.getLoginName());
         param.put(HGSJ003.FIELD_ACCOUNT_CODE,UserSessionUtils.getAccountCode());
 
         List list = new ArrayList<>(Arrays.asList(HGSJ003.FIELD_PROCESS_CODE,HGSJ003.FIELD_PROCESS_NAME,HGSJ003.FIELD_PROCESS_CLASS_NAME,

src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ001.xml

@@ -107,6 +107,9 @@
 		<isNotEmpty prepend=" AND " property="status">
 			STATUS = #status#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="processNames">
+			PROCESS_NAME LIKE CONCAT('%', #processNames#, '%')
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ003.xml

@@ -364,13 +364,9 @@
 			'' as "thick"
 		from hggp.hggy001
 		where ACCOUNT_CODE = #accountCode#
-		  	AND FACTORY_CODE IN (
-		      	select distinct
-		    		ORG_ENAME
-				from iplat_hggp.txsog01 A
-		      	inner join iplat_hggp.txsog02 B ON A.ORG_ID = B.ORG_ID
-				where A.ACCOUNT_CODE = #accountCode# and A.ORG_TYPE in (#orgType#) AND B.USER_ID = #loginName#
-		  	)
+		<isNotEmpty prepend=" AND " property="deleteFlag">
+			DELETE_FLAG = #deleteFlag#
+		</isNotEmpty>
 	</select>
 	
 	<select id="queryCompanyCode" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">

src/main/java/com/baosight/hggp/util/ExcelUtils.java

@@ -219,13 +219,13 @@ public class ExcelUtils {
 					break;
 				case "HGSJ003":
 					HGSJ003 hgsj003 = new HGSJ003();
-					Map<String, String> mapSmall = HGSJTools.Hgsj003.getSmallCode("hggp.hgsj.processClass");
+					Map mapSmall = HGSJTools.Hgsj003.getSmallCode("hggp.hgsj.processClass");
 					for (Map<?, ?> map : arrayList) {
-						String processClass = MapUtils.getString(mapSmall, map.get(HGSJ003.FIELD_PROCESS_CLASS_NAME));
+						String processClass = MapUtils.getString(mapSmall, StringUtils.trimToEmpty(map.get(HGSJ003.FIELD_PROCESS_CLASS_NAME).toString()));
 						AssertUtils.isEmpty(processClass, String.format("工序分类[%s]代码不存在，添加失败！", map.get(HGSJ003.FIELD_PROCESS_CLASS_NAME)));
 						hgsj003.fromMap(map);
 						// 设置规格
-						if (org.apache.commons.lang3.StringUtils.isBlank(hgsj003.getSpec())) {
+						if (StringUtils.isBlank(hgsj003.getSpec())) {
 							hgsj003.setSpec(HGSJTools.Hgsj003.jointSpec(hgsj003.getLength(), hgsj003.getWidth(), hgsj003.getThick()));
 						}
 						// 去除空格

src/main/webapp/HG/SB/HGSB001.js

@@ -101,6 +101,15 @@ $(function () {
 
                 }
             ],
+            exportGrid: {
+                exportFileName: function (gridInstance) {
+                    // 导出的文件名包含时间戳 yyyy-MM-dd HH:mm:ss
+                    return "设备台账_" + kendo.toString(new Date(), IPLAT.FORMAT.DATE_14_PR);
+                },
+                exportFileType: "xls",    // 默认值是xls，可选值为pdf[规划中]
+                exportBlockId: "result",  // 默认值和blockId相同，导出的EiInfo中的指定数据块被导出
+
+            },
             loadComplete: function(grid) {
                 // 此 grid 对象
                 // 处理父子级联动,通过监听 change 事件，判断父级节点是否发生变化

src/main/webapp/HG/SB/HGSB002.js

@@ -120,6 +120,15 @@ $(function () {
                     }
                 }
             ],
+            exportGrid: {
+                exportFileName: function (gridInstance) {
+                    // 导出的文件名包含时间戳 yyyy-MM-dd HH:mm:ss
+                    return "设备计划_" + kendo.toString(new Date(), IPLAT.FORMAT.DATE_14_PR);
+                },
+                exportFileType: "xls",    // 默认值是xls，可选值为pdf[规划中]
+                exportBlockId: "result",  // 默认值和blockId相同，导出的EiInfo中的指定数据块被导出
+
+            },
             loadComplete: function(grid) {
                 // 此 grid 对象
                 // 处理父子级联动,通过监听 change 事件，判断父级节点是否发生变化

src/main/webapp/HG/SB/HGSB002A.js

@@ -66,6 +66,15 @@ $(function () {
                     }
                 }
             ],
+            exportGrid: {
+                exportFileName: function (gridInstance) {
+                    // 导出的文件名包含时间戳 yyyy-MM-dd HH:mm:ss
+                    return "设备计划详情_" + kendo.toString(new Date(), IPLAT.FORMAT.DATE_14_PR);
+                },
+                exportFileType: "xls",    // 默认值是xls，可选值为pdf[规划中]
+                exportBlockId: "result",  // 默认值和blockId相同，导出的EiInfo中的指定数据块被导出
+
+            },
             loadComplete: function(grid) {
                 // 此 grid 对象
                 // 处理父子级联动,通过监听 change 事件，判断父级节点是否发生变化

src/main/webapp/HG/SB/HGSB003.jsp

+<%--
+  Created by IntelliJ IDEA.
+  User: 1
+  Date: 2024/5/10
+  Time: 15:29
+  To change this template use File | Settings | File Templates.
+--%>
+<!DOCTYPE html>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ 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:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFSelect>
+            <EF:EFDatePicker blockId="inqu_status" row="0" ename="applyDate" cname="申请日期" role="date"
+                             format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
+            <EF:EFInput blockId="inqu_status" row="0" ename="deviceName" cname="设备名称" placeholder="模糊查询" colWidth="3"/>
+            <EF:EFInput blockId="inqu_status" row="0" ename="checkItem" cname="检查项" placeholder="模糊查询" colWidth="3"/>
+            <EF:EFInput blockId="inqu_status" row="0" ename="applyUserName" cname="申请人" placeholder="模糊查询" colWidth="3"/>
+        </div>
+    </EF:EFRegion>
+
+    <EF:EFRegion id="result" title="明细信息">
+        <EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
+            <EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
+            <EF:EFColumn ename="accountCode" cname="账套" hidden="true"/>
+            <%--blockName="factoryCodeBox_block_id"--%>
+            <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="220" align="center"/>
+            <EF:EFComboColumn ename="companyCode" cname="公司名称"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="120" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFComboColumn>
+            <EF:EFColumn ename="applyDate" cname="申请日期" width="120" enable="true" readonly="true" align="center" editType="date"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+            <EF:EFColumn ename="applyCode" cname="申请单号" width="100" enable="false" readonly="true" align="center"/>
+            <EF:EFComboColumn ename="deviceCode" cname="设备名称"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="120" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFOptions blockId="deviceCodeBox_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFComboColumn>
+            <EF:EFColumn ename="checkItem" cname="检查项" width="100" enable="true" readonly="false" align="center" required="true"/>
+            <EF:EFColumn ename="checkDescrip" cname="检查描述" type="textarea" width="160" align="center"/>
+            <EF:EFComboColumn ename="applyUserId" cname="申请人"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" width="100" readonly="false" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFComboColumn>
+            <EF:EFComboColumn ename="status" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="0">
+                <EF:EFCodeOption codeName="hggp.hgsb.approveStatus"/>
+            </EF:EFComboColumn>
+            <EF:EFColumn ename="docId" cname="维修图片" width="100" enable="false" readonly="true" align="center"/>
+            <EF:EFColumn cname="创建人" ename="createdName" align="center" width="100" readonly="true" required="false" enable="false"/>
+            <EF:EFColumn cname="创建时间" ename="createdTime" parseFormats="['yyyyMMddHHmmss']" editType="datetime"
+                         dateFormat="yyyy-MM-dd HH:mm:ss" align="center" width="120" readonly="true" required="false"
+                         enable="false"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+</EF:EFPage>

src/main/webapp/HG/SB/HGSB003A.js

+$(function () {
+
+
+    IPLATUI.EFUpload = {
+        uploadFile: {
+            success: function(e) {
+                let docId = e.response.docId;
+                let id = $("#inqu_status-0-id").val()
+                if (isBlank(docId)) {
+                    return;
+                }
+                $("#fileDocId").val(docId);
+                NotificationUtil("附件上传成功");
+                //saveTemp(e);
+                try {
+                    parent.JSColorbox.setValueCallback({"id":id,"docId":docId});
+                    parent.JSColorbox.close();
+                } catch (e){
+                }
+            },
+        }
+    };
+
+    function saveTemp(e) {
+        let docId = e.response.docId;
+        let docName = e.response.docName;
+        let docSize = e.response.docSize;
+        let docTag = e.response.docTag;
+        let docUrl = e.response.docUrl;
+        let result = new EiInfo();
+        result.set("result-0-docId",docId);
+        result.set("result-0-docName",docName);
+        result.set("result-0-docSize",docSize);
+        result.set("result-0-docTag",docTag);
+        result.set("result-0-realPath",docUrl);
+        result.set("result-0-bizType",$("#inqu_status-0-bizType").val());
+        result.set("result-0-matId",$("#inqu_status-0-matId").val());
+        EiCommunicator.send("HPDS002", "insert", result, {
+            onSuccess: function (ei) {
+                if (ei.getStatus() >= 0) {
+                    if (ei.getStatus() == 0) {
+                        NotificationUtil(ei, 'warning');
+                    } else {
+                        NotificationUtil(ei);
+                    }
+                } else {
+                    NotificationUtil(ei, "error");
+                }
+            },
+            onFail: function (ei) {
+                // 发生异常
+                NotificationUtil("操作失败，原因[" + ei + "]", "error");
+            }
+        });
+    }
+});
\ No newline at end of file

src/main/webapp/HG/SB/HGSB003A.jsp

+<%--
+  Created by IntelliJ IDEA.
+  User: 1
+  Date: 2024/5/10
+  Time: 16:38
+  To change this template use File | Settings | File Templates.
+--%>
+<!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:EFInput blockId="inqu_status" row="0" ename="id" cname="ID" type="hidden"/>
+    <EF:EFRegion id="result">
+        <EF:EFUpload blockId="result" ename="uploadFile" docTag="hg_file003" path="A"/>
+    </EF:EFRegion>
+    <EF:EFInput ename="fileDocId" cname="" hidden="true"/>
+</EF:EFPage>

src/main/webapp/HG/SJ/HGSJ001.js

@@ -178,10 +178,7 @@ let save = function (btnNode) {
     if(flag) {
         JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
             ok: function () {
-                JSUtils.submitGridsData("result", "HGSJ001", "save", true,
-                    function (e) {
-                        query();
-                    });
+                JSUtils.submitGridsData("result", "HGSJ001", "save", true);
                 btnNode.attr("disabled", false);
             }
         });