Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

图纸查看和异常率报表

Browse Source
master
philip 3 years ago
parent 480e114225
commit 4f4bfb13f1
7 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File

7
common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
Unescape Escape View File

@ -128,6 +128,13 @@ public class ReportDataController {
return R.ok(result);
}
@GetMapping("/abnormalRate")
public R findAbnormalRate(@RequestParam(required = false) Map paramMap) {
paramMap.put("site", CommonMethods.getSite());
List<Map<String, Object>> result = reportDataService.findAbnormalRate(paramMap);
return R.ok(result);
}
@GetMapping("/userPassRate")
public R findUserPassRate(@RequestParam(required = false) Map paramMap) {
paramMap.put("site", CommonMethods.getSite());

2
common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java
Unescape Escape View File

@ -29,6 +29,8 @@ public interface ReportDataMapper {
List<Map<String, Object>> findCheckUserPassRate(Map paramMap);
List<Map<String, Object>> findAbnormalRate(Map paramMap);
List<Map<String, Object>> findUserPassRate(Map paramMap);
List<Map<String, Object>> findInspectionDetailPassRate(Map paramMap);

1
common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java
Unescape Escape View File

@ -47,6 +47,7 @@ public interface ReportDataService {
List<Map<String, Object>> findCheckUserPassRate(Map paramMap);
List<Map<String, Object>> findAbnormalRate(Map paramMap);
List<Map<String, Object>> findUserPassRate(Map paramMap);

8
common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java
Unescape Escape View File

@ -1,10 +1,10 @@
package com.foreverwin.mesnac.common.service.impl;
import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.mesnac.common.ftp.CappFtpClient;
import com.foreverwin.mesnac.common.service.FileService;
import com.foreverwin.mesnac.common.util.ExceptionUtil;
import com.foreverwin.mesnac.common.util.GetDrawingVersionUtil;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.meapi.model.Sfc;
import com.foreverwin.mesnac.meapi.model.SfcDispatchDrawing;
@ -17,7 +17,6 @@ import org.apache.commons.net.ftp.FTPFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.regex.Pattern;
@ -89,13 +88,16 @@ public class FileServiceImpl implements FileService {
@Override
public Map<String, String> getFilePathsByItemBo(String itemBo) throws IOException {
String path="/"+ StringUtil.trimHandle(itemBo)+"_"+StringUtil.trimRevision(itemBo)+"/";
FTPClient connect = null;
Map<String,String> pathMap = new HashMap<>();
try {
connect = cappFtpClient.login();
String vision= GetDrawingVersionUtil.GetDrawingVerson(itemBo, connect);
String path="/"+ StringUtil.trimHandle(itemBo)+"_"+vision+"/";
connect.changeWorkingDirectory(path);
connect.enterLocalPassiveMode();
FTPFile[] files = connect.listFiles();
if(files!=null){
for (int i = 0; i < files.length; i++) {

5
common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java
Unescape Escape View File

@ -80,6 +80,11 @@ public class ReportDataServiceImpl implements ReportDataService{
return reportDataMapper.findCheckUserPassRate(paramMap);
}
@Override
public List<Map<String, Object>> findAbnormalRate(Map paramMap) {
return reportDataMapper.findAbnormalRate(paramMap);
}
@Override
public List<Map<String, Object>> findUserPassRate(Map paramMap) {
return reportDataMapper.findUserPassRate(paramMap);

5
common/src/main/java/com/foreverwin/mesnac/common/util/GetDrawingVersionUtil.java
Unescape Escape View File

@ -1,9 +1,6 @@
package com.foreverwin.mesnac.common.util;
import com.foreverwin.mesnac.common.ftp.CappFtpClient;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.IOException;
import java.util.ArrayList;
@ -11,7 +8,7 @@ import java.util.List;
public class GetDrawingVersionUtil {
// CappFtpClient cappFtpClient=new CappFtpClient();
public String GetDrawingVerson(String itemBo, FTPClient connect) throws IOException {
public static String GetDrawingVerson(String itemBo, FTPClient connect) throws IOException {
char VersionInit = 'A';
List<String> list = new ArrayList<>();
for (int i = 0; i < 26; i++) {

24
common/src/main/resources/mapper/ReportDataMapper.xml
Unescape Escape View File

@ -709,6 +709,29 @@
</if>
</select>
<select id="findAbnormalRate" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT "MONTH",WORK_CENTER,DESCRIPTION,sum(QTY) QTY,sum(AB_QTY) AB_QTY,round(NVL(sum(AB_QTY)*100,0)/sum(qty),2)||'%' RATE FROM (
SELECT TO_CHAR(zsd.PLANNED_COMP_DATE,'YYYY-MM') "MONTH",zsd.WORK_CENTER,WT.DESCRIPTION,nvl(sum(DISPATCH_QTY),0) qty ,nvl(sum(zab.NC_QTY),0) AB_QTY
FROM Z_SFC_DISPATCH zsd
JOIN WORK_CENTER WC ON WC.SITE = zsd.SITE AND WC.WORK_CENTER = zsd.WORK_CENTER
LEFT JOIN WORK_CENTER_T WT ON WT.WORK_CENTER_BO = WC.HANDLE AND WT.LOCALE = 'zh'
LEFT JOIN Z_ABNORMAL_BILL ZAB ON zsd.SFC=ZAB.SFC AND zsd.SITE=ZAB.SITE AND zsd.STEP_ID=ZAB.STEP_ID AND zab."TYPE"='Z'
WHERE zsd.PLANNED_COMP_DATE IS NOT NULL
<if test="workCenter != null and workCenter != ''">
AND ZSD.WORK_CENTER = #{workCenter}
</if>
<if test="startFromDate != null and startFromDate != ''" >
AND TO_CHAR(zsd.PLANNED_COMP_DATE,'YYYY-MM') >=#{startFromDate}
</if>
<if test="startToDate != null and startToDate != ''" >
AND TO_CHAR(zsd.PLANNED_COMP_DATE,'YYYY-MM') &lt;= #{startToDate}
</if>
GROUP BY zsd.WORK_CENTER,WT.DESCRIPTION,zsd.PLANNED_COMP_DATE
)
GROUP BY "MONTH",WORK_CENTER,DESCRIPTION
ORDER BY WORK_CENTER, "MONTH"
</select>
<update id="doItemMove">
UPDATE Z_SFC_DISPATCH ZSD SET ZSD.OTHER_3 = 'true' WHERE ZSD.HANDLE IN
<foreach item="item" collection="list" separator="," open="(" close=")" index="">
@ -717,4 +740,5 @@
AND ZSD.SITE = #{site}
</update>
</mapper>
Write Preview
Loading…
Cancel
Save