fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/manager/PhoneManager.java
@@ -17,6 +17,7 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.sun.jna.platform.mac.MacFileUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -168,17 +169,12 @@ String filePath = fileService.getInoutFilePath(); // 获取新的ID String newFileName = ContextUtil.UUID(); String newFileName = DateFormatUtils.format(new Date(), "yyyyMMddHHmmssSSS"); // 文件后缀名 String suffixName = oldFileName.substring(oldFileName.lastIndexOf(".")); // 合成新的文件名 if (StringUtils.isEmpty(plateNum)) { newFileName = newFileName + suffixName; } else { newFileName = plateNum + "_" + newFileName + suffixName; } newFileName = newFileName + suffixName; // 文件上传 boolean flag = uploadFile(fileByte, filePath, newFileName); @@ -213,7 +209,7 @@ String filePath = fileService.getPatrolFilePath(); // 获取新的ID String newFileName = DateUtils.dateTimeNow(); String newFileName = DateFormatUtils.format(new Date(), "yyyyMMddHHmmssSSS"); // 文件后缀名 String suffixName = oldFileName.substring(oldFileName.lastIndexOf(".")); fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5206.java
@@ -63,7 +63,7 @@ param.setDeptId(authUser.getDeptId()); } //获取所有筒仓及浅圆仓 List<Depot> depotList = depotService.getCacheDepotList(param.getDeptId()); List<Depot> depotList = depotService.getCacheDepotList(ContextUtil.getCompanyId(), param.getDeptId()); if (null == depotList || depotList.isEmpty()) { return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "未查到信息!!"); } @@ -79,13 +79,13 @@ if (null == quantityList || quantityList.isEmpty()) { quantity.setDepotId(depot.getId()); } else { BeanUtils.copyProperties(quantityList.get(0),quantity); BeanUtils.copyProperties(quantityList.get(0), quantity); dept = deptService.getCacheDept(depot.getCompanyId(), depot.getDeptId()); quantity.setDepotData(depot); quantity.setDeptName(dept.getDeptName()); list.add(quantity); } dept = deptService.getCacheDept(depot.getCompanyId(),depot.getDeptId()); quantity.setDepotData(depot); quantity.setDeptName(dept.getDeptName()); list.add(quantity); } }