2024-10-12 采购收货单状态为已收货，详情的保存按钮可以显示，不管是手工增加还是选择采购合同都可以修改再保存详情的数据

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD004.java

@@ -12,9 +12,7 @@ import com.baosight.hggp.hg.wd.domain.HGWD001;
 import com.baosight.hggp.hg.wd.domain.HGWD001A;
 import com.baosight.hggp.hg.wd.domain.HGWD099;
 import com.baosight.hggp.hg.xs.domain.Org;
-import com.baosight.hggp.util.CommonMethod;
-import com.baosight.hggp.util.LogUtils;
-import com.baosight.hggp.util.StringUtil;
+import com.baosight.hggp.util.*;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -23,10 +21,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -103,4 +98,36 @@ public class ServiceHGWD004 extends ServiceEPBase {
         }
         return inInfo;
     }
+
+    /**
+     * 批量下载
+     *
+     * @param inInfo
+     * @return
+     */
+    @OperationLogAnnotation(operModul = "回收站", operType = "下载", operDesc = "批量操作")
+    public EiInfo batchDownload(EiInfo inInfo) {
+        try {
+            List<HGWD001A> hgwd001AList = MapUtils.toDaoEPBases(inInfo, HGWD001A.class);
+            if (hgwd001AList.size()>0){
+                HGWD001A hgwd001A = hgwd001AList.get(0);
+                String fileName = hgwd001A.getChangeContent();
+                String zipName = fileName + "_" + DateUtils.shortDateTime();
+                List<String> docIds = new ArrayList<>();
+                for (HGWD001A hgwd001 : hgwd001AList){
+                    String docId = hgwd001.getChangeStartCode();
+                    if ("uploadAdd".equals(hgwd001.getChangeType())  || "uploadDelete".equals(hgwd001.getChangeType())) {
+                        docId = hgwd001.getChangeEndCode();
+
+                    }
+                    docIds.add(docId);
+                }
+                inInfo.set("downloadUrl", Iplat4jUtils.compressFile(docIds, zipName));
+            }
+
+        } catch (Exception e) {
+            LogUtils.setMsg(inInfo, e, "批量下载失败");
+        }
+        return inInfo;
+    }
 }

src/main/webapp/HG/CG/HGCG003B.js

@@ -176,7 +176,6 @@ $(window).load(function () {
 		var source = $("#source").val();
 		if (source === '0') {
 			$(".k-grid-add").hide();
-			$(".k-grid-save-changes").hide();
 			$(".k-grid-cancel-changes").hide();
 			$(".k-grid-delete").hide();
 		}

src/main/webapp/HG/WD/HGWD004.js

@@ -72,8 +72,20 @@ let download = function () {
         message("请选择数据");
         return;
     }
-    for (let i = 0; i < rows.length; i++) {
-        window.open(downloadHref(rows[i]['changeStartCode']), '_blank');
+    if (rows.length == 1){
+        let docId = rows[0]['changeStartCode'];
+        if (rows[0]['changeType'] === "uploadAdd" || rows[0]['changeType'] === "uploadDelete") {
+            docId = rows[0]['changeEndCode'];
+        }
+        window.open(downloadHref(docId), '_blank');
+    }else {
+        JSUtils.submitGridsData("result", "HGWD004", "batchDownload", false,
+            function (res) {
+                if (res.status > -1) {
+                    window.open(res.extAttr.downloadUrl, '_blank');
+                }
+            }
+        );
     }
 }
 

src/main/webapp/HG/WD/HGWD004.jsp

@@ -21,18 +21,19 @@
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
             <EF:EFInput blockId="inqu_status" row="0" ename="projName" cname="项目名称" placeholder="模糊查询" colWidth="3"/>
+            <EF:EFInput blockId="inqu_status" row="0" ename="changeContent" cname="文件名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFDateSpan startCname="删除开始日期" endCname="删除结束日期" blockId="inqu_status" row="0" colWidth="3"
                            startName="createdTimeFrom" endName="createdTimeTo" role="date"
                            format="yyyy-MM-dd" satrtRatio="4:8" endRatio="4:8"/>
-            <EF:EFInput blockId="inqu_status" row="0" ename="changeContent" cname="文件名称" placeholder="模糊查询" colWidth="3"/>
         </div>
     </EF:EFRegion>
 
 	<EF:EFRegion id="result" title="明细信息" fitHeight="true">
 		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" showCount="true" height="74vh">
 			<EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
-            <EF:EFColumn ename="projName" cname="项目名称" width="160" enable="true" readonly="false" align="left" required="false"/>
-            <EF:EFColumn ename="changeContent" cname="文件名称" width="160" enable="true" readonly="true" align="left" required="false"/>
+            <EF:EFColumn ename="projCode" cname="项目编码" width="160" enable="true" readonly="false" align="center" required="false"/>
+            <EF:EFColumn ename="projName" cname="项目名称" width="160" enable="true" readonly="false" align="center" required="false"/>
+            <EF:EFColumn ename="changeContent" cname="文件名称" width="160" enable="true" readonly="true" align="center" required="false"/>
             <%--<EF:EFColumn ename="changeStartCode" cname="附件ID" width="160" enable="true" readonly="false" align="center" required="false"/>--%>
             <EF:EFColumn ename="changeStart" cname="附件名称" width="160" enable="true" readonly="true" align="left" required="false"/>
             <EF:EFColumn ename="createdName" cname="删除人" align="center" width="100" readonly="true" required="false"