Merge remote-tracking branch 'origin/master'

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,"中继服务地址未配置，请至同步设置中进行配置");
         }

src/main/java/com/glxp/api/res/inv/InvPreProductResponse.java

@@ -105,4 +105,8 @@ public class InvPreProductResponse {
      */
     private String invCode;
 
+    /**
+        计量单位
+     */
+    private String measname;
 }

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>
+</mapper>