diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java index 58bbb7cc..edbee773 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java @@ -459,7 +459,7 @@ public class AbnormalBillController { try{ abnormalBill.setHandle(HandleEnum.ABNORMAL_BILL.getHandle(site,abnormalBill.getAbnormalNo())); - abnormalBill.setItemBo(HandleEnum.ITEM.getHandle(site,abnormalBill.getItemBo(),"A")); + abnormalBill.setItemBo(null); abnormalBillService.programConfirm(abnormalBill,abnormalBillDispose); return new ResultVo(ResultCode.SUCCESS,"BPM方案确认回传成功"); }catch(Exception e){ diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java index 8af5e438..0fb04c97 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java @@ -628,6 +628,20 @@ public class ReportController { } } + /** + * 设备稼动率报表 + * @param + * @return + */ + @GetMapping("/operationRateOfEquipmentReport") + public R operationRateOfEquipmentReport(@RequestParam(required = false) Map paramMap){ + try { + return R.ok(reportService.operationRateOfEquipmentReport(paramMap)); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + /** * 工时看板 * @param diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java index fe5edea4..6d4de263 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java @@ -328,4 +328,11 @@ public interface ReportMapper { * @return */ List> inventoryTableSave(Map paramMap); + + /** + * 设备稼动率报表 + * @param paramMap + * @return + */ + List> operationRateOfEquipmentReport(Map paramMap); } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java index 69e1c893..a20fb615 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java @@ -320,4 +320,11 @@ public interface ReportService { * @return */ List> inventoryTableSave(Map paramMap); + + /** + * 设备稼动率报表 + * @param paramMap + * @return + */ + List> operationRateOfEquipmentReport(Map paramMap); } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/FileUploadedServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/FileUploadedServiceImpl.java index d571d37d..daf2df21 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/FileUploadedServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/FileUploadedServiceImpl.java @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.anomaly.service.impl; +import cn.hutool.core.util.CharsetUtil; import cn.hutool.extra.ftp.Ftp; import com.foreverwin.mesnac.anomaly.service.FileUploadedService; import com.foreverwin.mesnac.common.util.StringUtil; @@ -193,7 +194,7 @@ public class FileUploadedServiceImpl implements FileUploadedService { //上传附件名称 String fileName = fileItem.getName(); try { - Ftp ftp = new Ftp(host, port,username,password); + Ftp ftp = new Ftp(host, port,username,password, CharsetUtil.CHARSET_GBK); ftp.upload(ftpPath, fileName, fileItem.getInputStream()); ftp.close(); } catch (IOException e) { diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java index 6aa32011..9b143d7a 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java @@ -1786,6 +1786,19 @@ public class ReportServiceImpl implements ReportService { return reportMapper.inventoryTableSave(paramMap); } + /** + * 设备稼动率报表 + * @param paramMap + * @return + */ + @Override + public List> operationRateOfEquipmentReport(Map paramMap) { + String site = CommonMethods.getSite(); + paramMap.put("site", site); + paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage()); + return reportMapper.operationRateOfEquipmentReport(paramMap); + } + /** * 工时统计报表 * @param paramMap diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 9fbc9610..18bc83c6 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -3307,6 +3307,29 @@ SELECT zab.CREATED_DATE_TIME, + \ No newline at end of file diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java index 857cc5fd..29b40953 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java @@ -257,6 +257,8 @@ public class FileServiceImpl implements FileService { } } catch (Exception e) { e.printStackTrace(); + } finally { + jSchClient.close(); } } if (jSchClient != null){