From 033d84eb13a9958232a95086a4c16e2fcdaac78d Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 18 Apr 2023 14:34:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/res/inv/InvPreProductResponse.java     | 4 ++++
 src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml   | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/inv/InvPreProductResponse.java b/src/main/java/com/glxp/api/res/inv/InvPreProductResponse.java
index 49604be8..65b99981 100644
--- a/src/main/java/com/glxp/api/res/inv/InvPreProductResponse.java
+++ b/src/main/java/com/glxp/api/res/inv/InvPreProductResponse.java
@@ -105,4 +105,8 @@ public class InvPreProductResponse {
      */
     private String invCode;
 
+    /**
+        计量单位
+     */
+    private String measname;
 }
diff --git a/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml
index 8c337f5b..fed3333a 100644
--- a/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml
@@ -21,7 +21,8 @@
                auth_dept.name      deptName,
                auth_warehouse.name invName,
                ipp.deptCode,
-               ipp.invCode
+               ipp.invCode,
+               bp.measname
         from inv_pre_product ipp
                  inner join basic_udirel on ipp.relIdFk = basic_udirel.id
                  inner join basic_products bp on basic_udirel.uuid = bp.uuid
@@ -135,4 +136,4 @@
             </if>
         </where>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

From ce60afd9b2accfb0698f096e505f78caf953883b Mon Sep 17 00:00:00 2001
From: chengqf <584883665@139.com>
Date: Tue, 18 Apr 2023 14:42:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/idc/service/impl/FileServiceImpl.java  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java
index c47c5725..0662b163 100644
--- a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java
+++ b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java
@@ -104,7 +104,20 @@ public class FileServiceImpl implements FileService {
     public BaseResponse fileDownload(HttpServletRequest request,Map<String,Object> params) {
         Map<String, Object> map = dbDao.get("select * from sync_data_set limit 1");
         if(map!=null&&map.get("syncIp")!=null) {
+       
             String result = IDCUtils.post(map.get("syncIp").toString()+"/spssync/file/downloadFile", params);
+            JSONObject object = JSON.parseObject(result);
+            boolean success = false;
+            if(object.getInteger("code")==20000) {
+                String[] files = params.get("fileName").toString().split(",");
+                success = true;
+                for(String str:files) {
+                    if(!idcService.signleDownloadFile(map.get("syncIp").toString(), str))
+                        success = false;
+                }
+            }
+            if(!success)
+                return ResultVOUtils.error(9999,"失败");
         } else {
             return ResultVOUtils.error(9999,"中继服务地址未配置，请至同步设置中进行配置");
         }