Merge remote-tracking branch 'origin/master'

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){

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

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java

@@ -328,4 +328,11 @@ public interface ReportMapper {
      * @return
      */
     List<Map<String, String>> inventoryTableSave(Map paramMap);
+
+    /**
+     * 设备稼动率报表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, String>> operationRateOfEquipmentReport(Map paramMap);
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java

@@ -320,4 +320,11 @@ public interface ReportService {
      * @return
      */
     List<Map<String, String>> inventoryTableSave(Map paramMap);
+
+    /**
+     * 设备稼动率报表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, String>> operationRateOfEquipmentReport(Map paramMap);
 }

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) {

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<Map<String, String>> operationRateOfEquipmentReport(Map paramMap) {
+        String site = CommonMethods.getSite();
+        paramMap.put("site", site);
+        paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
+        return reportMapper.operationRateOfEquipmentReport(paramMap);
+    }
+
     /**
      * 工时统计报表
      * @param paramMap

anomaly/src/main/resources/mapper/ReportMapper.xml

@@ -3307,6 +3307,29 @@ SELECT zab.CREATED_DATE_TIME,
             </if>
         </where>
     </select>
+    <select id="operationRateOfEquipmentReport" resultType="java.util.Map">
+        SELECT *
+        FROM OPERATION_RATE_OF_EQUIPMENT_REPORT V
+        WHERE 1=1
+        <if test="workCenter != null and workCenter != ''">
+            AND V.WORK_CENTER = #{workCenter}
+        </if>
+        <if test="resrce != null and resrce != ''">
+            AND V.RESRCE = #{resrce}
+        </if>
+        <if test="sapDescription != null and sapDescription != ''">
+            AND V.SAP_WORK_CENTER_DESCRIPTION like '%${sapDescription}%'
+        </if>
+        <if test="resrceDescription != null and resrceDescription != ''">
+            AND V.RESRCE_DESCRIPTION like '%${resrceDescription}%'
+        </if>
+        <if test="startDate != null and startDate != ''">
+            AND V.SEND_DATE >= #{startDate}
+        </if>
+        <if test="endDate != null and endDate != ''">
+            AND V.SEND_DATE &lt;= #{endDate}
+        </if>
+    </select>
 
 
 </mapper>

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){