1.删除无用的引用

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC001.java

@@ -8,7 +8,13 @@ import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC001;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
-import com.baosight.hpjx.util.*;
+import com.baosight.hpjx.util.AssertUtils;
+import com.baosight.hpjx.util.BeanUtils;
+import com.baosight.hpjx.util.CommonMethod;
+import com.baosight.hpjx.util.EiInfoUtils;
+import com.baosight.hpjx.util.LogUtils;
+import com.baosight.hpjx.util.ObjectUtils;
+import com.baosight.hpjx.util.StringUtil;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
@@ -17,7 +23,10 @@ import com.baosight.iplat4j.ed.util.SequenceGenerator;
 import org.apache.commons.collections.MapUtils;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author YK

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC002.java

@@ -6,26 +6,24 @@ import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC002;
-import com.baosight.hpjx.hp.kc.domain.HPKC004;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
-import com.baosight.hpjx.hp.pz.domain.HPPZ007;
-import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.BeanUtils;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.EiInfoUtils;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.hpjx.util.ObjectUtils;
 import com.baosight.hpjx.util.StringUtil;
-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.service.impl.ServiceBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang3.StringUtils;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author:songx

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC002A.java

@@ -6,7 +6,6 @@ import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC002;
-import com.baosight.hpjx.hp.kc.domain.HPKC004;
 import com.baosight.hpjx.hp.kc.domain.HPKC010;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
 import com.baosight.hpjx.util.AssertUtils;

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004.java

@@ -6,25 +6,23 @@ import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC004;
-import com.baosight.hpjx.hp.kc.domain.HPKC006;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
-import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.hpjx.util.BeanUtils;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.EiInfoUtils;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.hpjx.util.ObjectUtils;
 import com.baosight.hpjx.util.StringUtil;
-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.service.impl.ServiceBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
-
 import org.apache.commons.collections.MapUtils;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author:songx

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004A.java

@@ -6,7 +6,6 @@ import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC004;
-import com.baosight.hpjx.hp.kc.domain.HPKC007;
 import com.baosight.hpjx.hp.kc.domain.HPKC010;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
 import com.baosight.hpjx.util.AssertUtils;

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005.java

@@ -7,10 +7,8 @@ import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.constant.HPSqlConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC005;
 import com.baosight.hpjx.hp.kc.domain.HPKC006;
-import com.baosight.hpjx.hp.kc.domain.HPKC007;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
-import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.BeanUtils;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.EiInfoUtils;

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005A.java

@@ -4,7 +4,6 @@ import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC005;
-import com.baosight.hpjx.hp.kc.domain.HPKC007;
 import com.baosight.hpjx.hp.kc.domain.HPKC010;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
 import com.baosight.hpjx.util.AssertUtils;

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC009.java

@@ -2,7 +2,6 @@ package com.baosight.hpjx.hp.kc.service;
 
 import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.core.constant.CommonConstant;
-import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.constant.HPSqlConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC001;
@@ -13,11 +12,9 @@ import com.baosight.hpjx.hp.kc.domain.HPKC005;
 import com.baosight.hpjx.hp.kc.domain.HPKC006;
 import com.baosight.hpjx.hp.kc.domain.HPKC007;
 import com.baosight.hpjx.hp.kc.domain.HPKC009;
-import com.baosight.hpjx.hp.kc.domain.HPKC010;
 import com.baosight.hpjx.hp.kc.domain.HPKC010A;
-import com.baosight.hpjx.hp.pz.domain.HPPZ007;
-import com.baosight.hpjx.hp.pz.domain.HPPZ009;
 import com.baosight.hpjx.hp.pz.domain.HPPZ004;
+import com.baosight.hpjx.hp.pz.domain.HPPZ007;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.hpjx.util.BeanUtils;
 import com.baosight.hpjx.util.CommonMethod;
@@ -31,9 +28,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 import com.baosight.iplat4j.core.web.threadlocal.UserSession;
-
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.StringUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC010.java

@@ -6,7 +6,8 @@ import com.baosight.hpjx.core.security.UserSessionUtils;
 import com.baosight.hpjx.hp.kc.domain.HPKC010;
 import com.baosight.hpjx.hp.pz.domain.HPPZ006;
 import com.baosight.hpjx.hp.pz.domain.HPPZ007;
-import com.baosight.hpjx.util.*;
+import com.baosight.hpjx.util.CommonMethod;
+import com.baosight.hpjx.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
@@ -18,7 +19,12 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  *

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC010A.java

 package com.baosight.hpjx.hp.kc.service;
 
-import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPSqlConstant;
-import com.baosight.hpjx.hp.kc.domain.HPKC010;
-import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.DateUtils;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -12,7 +9,6 @@ import com.baosight.iplat4j.core.service.impl.ServiceBase;
 
 import java.time.LocalDate;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

src/main/webapp/EU/DM/EUDM07.jsp

+<%@ page contentType="text/html;charset=UTF-8" trimDirectiveWhitespaces="true" %>
+<%@ page import="com.baosight.iplat4j.config.AdminFactoryConfig" %>
+<%@ page import="com.baosight.iplat4j.core.log.Logger" %>
+<%@ page import="com.baosight.iplat4j.core.log.LoggerFactory" %>
+<%@ page import="com.baosight.iplat4j.eu.dm.util.IFileUploadManager" %>
+<%@ page import="org.apache.commons.lang.StringUtils" %>
+
+<%
+    // 根据docId获取单个附件的JSON信息
+    // 根据docTag获取附件列表JSON信息
+
+    String docId = request.getParameter("docId");
+    String docTag = request.getParameter("docTag");
+    String fileLocation = request.getParameter("fileLocation");
+    String orderBy = request.getParameter("orderBy") == null ? "" : request.getParameter("orderBy");
+
+    String fileJSON = "[]";
+
+    try {
+//            if (StringUtils.isNotEmpty(docId)) {
+//                // 根据附件的docId获取单个附件在TEUDM02表中的信息
+//                fileJSON = AdminFactoryConfig.getFileUpLoadInterface().getDocJSONById(docId);
+//            } else {
+//                // 根据docTag获取附件列表JSON信息
+//                if (StringUtils.isNotEmpty(docTag)) {
+//                    fileJSON = AdminFactoryConfig.getFileUpLoadInterface().getDocJSONByTag(docTag, orderBy);
+//                }
+//            }
+    } catch (Exception e) {
+        Logger logger = LoggerFactory.getLogger(IFileUploadManager.class);
+        logger.error("无法获取附件信息", e);
+        out.print("无法获取附件信息:" + e.getMessage());
+    }
+
+    out.print(fileJSON);
+%>

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

@@ -72,7 +72,8 @@
 		    <EF:EFColumn ename="createdTime" cname="创建日期" enable="false" width="140" align="center"
 		                 editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
 	    </EF:EFGrid>
-	    <p class="text-info"><span style='color: red;'>注：差异数量=实物数量-账面数量；差异重量=实物重量-账面重量 </span></p>
+	    <br/>
+	    <span style='color: red;font-size: 13px;'>说明：差异数量=实物数量-账面数量；差异重量=实物重量-账面重量</span>
     </EF:EFRegion>
 
 </EF:EFPage>

src/main/webapp/HP/PZ/HPPZ009.jsp

@@ -29,6 +29,7 @@
 			<EF:EFColumn cname="修改时间" ename="updatedTime" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
 		</EF:EFGrid>
-		<p class="text-info"><span style='color: red;'>注：新增企业时会新增企业管理员账户，账号和密码与企业编码相同</span></p>
+		<br/>
+		<span style='color: red;font-size: 13px;'>说明：新增企业时会同步新增企业管理员账户，账号和密码与企业编码相同</span>
 	</EF:EFRegion>
 </EF:EFPage>