From 2fafa1d7d2dc3ce074d7035d8e5f2a87f38a68ca Mon Sep 17 00:00:00 2001 From: yangwl <1726150332@qq.com> Date: Wed, 21 Sep 2022 14:12:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E6=A8=A1=E5=9D=97=E3=80=81?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A8=A1=E5=9D=97=E3=80=81=E6=B4=BE=E5=B7=A5?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anomaly/dto/AbnormalBillDisposeDto.java | 12 + .../mesnac/anomaly/model/AbnormalBill.java | 10 + .../service/impl/AbnormalBillServiceImpl.java | 70 +++--- .../service/impl/AbnormalPlanServiceImpl.java | 21 +- .../service/impl/ReportServiceImpl.java | 3 +- .../resources/mapper/AbnormalBillMapper.xml | 5 +- .../common/controller/FileController.java | 62 ++++- .../controller/ReportDataController.java | 18 ++ .../common/ftp/WorkmanshipCardFtpClient.java | 2 +- .../common/mapper/ReportDataMapper.java | 2 + .../resources/mapper/ReportDataMapper.xml | 3 + .../resources/mapper/SfcDispatchMapper.xml | 37 +-- .../service/impl/InterfaceServiceImpl.java | 3 +- .../meapi/mapper/LogisticsTurnoverMapper.java | 2 +- .../service/LogisticsTurnoverService.java | 2 +- .../impl/LogisticsTurnoverServiceImpl.java | 4 +- .../mapper/LogisticsTurnoverMapper.xml | 26 +- .../service/impl/PodTemplateServiceImpl.java | 73 +++--- .../impl/InspectionTaskManageServiceImpl.java | 228 ++++++++++-------- .../mapper/InspectionTaskManageMapper.xml | 1 + 20 files changed, 381 insertions(+), 203 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java index c5563dcd..3bf4edb6 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java @@ -3,6 +3,8 @@ package com.foreverwin.mesnac.anomaly.dto; import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; /** * @Description 作异常响应检索用的 @@ -260,6 +262,16 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose { this.createdDateTime = createdDateTime; } + + private List> list; + + public List> getList() { + return list; + } + + public void setList(List> list) { + this.list = list; + } // // public LocalDateTime getDutyDatetime() { // return dutyDatetime; diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java index 80ef2875..f6ba0c46 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java @@ -286,6 +286,16 @@ public class AbnormalBill extends Model { @TableField("USER_IS_CON") private String userIsCon; + private String disRouterBo; + + public String getDisRouterBo() { + return disRouterBo; + } + + public void setDisRouterBo(String disRouterBo) { + this.disRouterBo = disRouterBo; + } + public LocalDateTime getUserConTime() { return userConTime; } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index 9665be7e..0aaa877d 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java @@ -203,6 +203,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl NcCodeGroupList = (List)abnormalBill.getNcCodeDesc().stream().map((e) -> { - return e.split("/")[0]; - }).collect(Collectors.toList()); - abnormalBill.setPbUser(CommonMethods.getUser()); - YunBpmApiRes bpmApiRes = yunBpmService.saveQualitySystem(abnormalBill, abnormalBillDispose, - String.join(";", NcCodeGroupList), String.join(";", abnormalBill.getNcCodeDesc())); - if (!bpmApiRes.getErrCode().equals(0)) { - throw new BaseException("MES提报给质量BPM系统失败"); - } - - String workflowInstanceId = JSON.parseObject(String.valueOf(bpmApiRes.getData())).getString("workflowInstanceId"); - abnormalBill.setBpmFlowId(workflowInstanceId); - } +// if (!StringUtil.isBlank(abnormalBill.getBpmSubmit()) && abnormalBill.getBpmSubmit().equals("false")) { +// //abnormalBill.setBpmSubmit("false"); +// List NcCodeGroupList = (List)abnormalBill.getNcCodeDesc().stream().map((e) -> { +// return e.split("/")[0]; +// }).collect(Collectors.toList()); +// abnormalBill.setPbUser(CommonMethods.getUser()); +// YunBpmApiRes bpmApiRes = yunBpmService.saveQualitySystem(abnormalBill, abnormalBillDispose, +// String.join(";", NcCodeGroupList), String.join(";", abnormalBill.getNcCodeDesc())); +// if (!bpmApiRes.getErrCode().equals(0)) { +// throw new BaseException("MES提报给质量BPM系统失败"); +// } +// +// String workflowInstanceId = JSON.parseObject(String.valueOf(bpmApiRes.getData())).getString("workflowInstanceId"); +// abnormalBill.setBpmFlowId(workflowInstanceId); +// } ArrayList abnormalNcCodes = new ArrayList<>(); @@ -346,6 +349,11 @@ public class AbnormalBillServiceImpl extends ServiceImpl> list= routerStepcontentMapper.selectDisRouterInfo(paramMap); + AbnormalBillDisposeDto abnormalBillDisposeDto= abnormalBillDisposeMapper.findAllByAbnormalNo(abnormalBill,local); + abnormalBillDisposeDto.setList(list); + return abnormalBillDisposeDto; } @Override @@ -688,16 +702,16 @@ public class AbnormalBillServiceImpl extends ServiceImpl abnormalBills = this.selectList(aBill); - abnormalBills.get(0).setStatus(Constants.SHUT_DOWN); - YunBpmApiRes bpmApiRes = yunBpmService.saveQualitySystem(abnormalBills.get(0), abnormalBillDispose, null, null); - if (!bpmApiRes.getErrCode().equals(0)) { - throw BusinessException.build("BPM闭环关闭失败"); - } - } +// if (StringUtil.isBlank(abnormalBill.getBpmSubmit())){ +// AbnormalBill aBill = new AbnormalBill(); +// aBill.setAbnormalNo(abnormalBill.getAbnormalNo()); +// List abnormalBills = this.selectList(aBill); +// abnormalBills.get(0).setStatus(Constants.SHUT_DOWN); +// YunBpmApiRes bpmApiRes = yunBpmService.saveQualitySystem(abnormalBills.get(0), abnormalBillDispose, null, null); +// if (!bpmApiRes.getErrCode().equals(0)) { +// throw BusinessException.build("BPM闭环关闭失败"); +// } +// } if(!StringUtil.isBlank(abnormalBill.getStatus())){ abnormalBill.setStatus(abnormalBill.getStatus()); @@ -1652,10 +1666,12 @@ public class AbnormalBillServiceImpl extends ServiceImpl abnormalBills) { boolean flag=this.updateBatchById(abnormalBills); + String site=CommonMethods.getSite(); if (flag){ //发送维修完成的消息给相关人员 for (AbnormalBill abnormalBill : abnormalBills){ abnormalBill.setType("S"); + abnormalBill.setSite(site); abnormalBill.setReportSendUserGroup("SBYCSB-REPAIRCOMPLETE"); this.sendMessageToDeviceRepairComplete(abnormalBill); } @@ -1836,7 +1852,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl customFieldByUserId_sc = usrMapper.findCustomFieldByUserId(site, nwaUsers_sc); if(customFieldByUserId_sc != null && customFieldByUserId_sc.size() <= 0){ - throw new BaseException("消息发送失败，生产用户组下面的用户的自定义数据没有维护"); + throw new BaseException("消息发送失败，用户组下面的用户的自定义数据没有维护"); } StringBuilder sendUsers_sc = new StringBuilder(); for (int i = 0; i < Objects.requireNonNull(customFieldByUserId_sc).size(); i++) { diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java index d2549c28..2ba64b64 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java @@ -201,7 +201,7 @@ public class AbnormalPlanServiceImpl extends ServiceImpl> result =routerStepcontentService.selectDisRouterInfo(map); String ReapirContent=""; @@ -260,7 +260,7 @@ public class AbnormalPlanServiceImpl extends ServiceImpl temporaryMap = qualityInspectionReport.get(i); String abnormalBo = (String) temporaryMap.get("ABNORMAL_NO"); String routerBo = (String) temporaryMap.get("ROUTER_BO"); - map.put("abnormalBo", abnormalBo); + // map.put("abnormalBo", abnormalBo); map.put("routerBo", routerBo); List> result = routerStepcontentService.selectDisRouterInfo(map); String ReapirContent = ""; @@ -249,7 +249,6 @@ public class ReportServiceImpl implements ReportService { } } qualityInspectionReport.get(i).put("ROUTER_STEP_CONTENT", ReapirContent); - } diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index 6e3a3067..625ecd0e 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -67,6 +67,7 @@ + @@ -985,7 +986,7 @@ diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/FileController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/FileController.java index 258238bb..874fafff 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/controller/FileController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/FileController.java @@ -141,9 +141,26 @@ public class FileController { if (null == in) { throw new BaseException("获取图纸文件路径为:【" + path + "】的文件流失败!"); } +// ByteArrayOutputStream outStream2 = new ByteArrayOutputStream(); +// BufferedReader reader = new BufferedReader(new InputStreamReader(in)); +// while (reader.ready()){ +// String line=reader.readLine(); +// } + +// BufferedReader in2=new BufferedReader(new InputStreamReader(in)); +// String y=""; +// while((y=in2.readLine())!=null){//一行一行读 +// outStream2.write(y.getBytes()); +// } + + ByteArrayOutputStream outStream = new ByteArrayOutputStream(); - byte[] buffer = new byte[1024*5]; - int len = -1; +// +// + + + int len = 0; + byte[] buffer = new byte[1024]; while((len = in.read(buffer)) != -1){ outStream.write(buffer, 0, len); } @@ -155,6 +172,40 @@ public class FileController { out.flush(); +// StringBuffer content = new StringBuffer(); +// try (FtpTemplate template = ftpTemplateFactory.createAndConnect()) +// { +// InputStream inputStream = template.retrieveFileStream(filePath); +// byte[] buf = new byte[1024]; +// int length = 0; +// while ((length = inputStream.read(buf)) != -1) +// { content.append(new String(buf, 0, length)); } +// } +// catch (IOException e) { +// e.printStackTrace(); +// LOG.error("获取ftp文件输入流异常", e); +// throw new BizException("获取ftp文件输入流异常"); +// } +// +// +// StringBuffer content = new StringBuffer(); +// try (FtpTemplate template = ftpTemplateFactory.createAndConnect()) { +// InputStream inputStream = template.retrieveFileStream(filePath); +// Reader reader = new InputStreamReader(inputStream); +// try( +// BufferedReader bufferedReader = new BufferedReader(reader)) +// { String read; +// while ((read = bufferedReader.readLine())!=null){ content.append(read+"\n"); } +// }catch (Exception e){ +// LOG.error("读取文件异常！", e); +// throw new BizException("读取文件异常！"); } +// } +// catch (Exception e) { e.printStackTrace(); +// LOG.error("获取ftp文件输入流异常", e); +// throw new BizException("获取ftp文件输入流异常"); +// } + + // ByteArrayOutputStream outStream = new ByteArrayOutputStream(); // // byte[] buffer = new byte[1024]; @@ -250,4 +301,11 @@ public class FileController { return R.ok(null, "下载文件成功!"); } + public static char byteToChar(byte[] b) { + int hi = (b[0] & 0xFF) << 8; + int lo = b[1] & 0xFF; + return (char) (hi | lo); + } + + } \ No newline at end of file diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java index 475a7d21..69845edb 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java @@ -175,6 +175,24 @@ public class ReportDataController { return R.failed(e.getMessage()); } } + + /** + * + * @param paramMap + * @return + */ + + @GetMapping("/selectItemMoveWaitTime") + public R selectItemMoveWaitTime(@RequestParam(required = false) Map paramMap) { + try{ + paramMap.put("site", CommonMethods.getSite()); + List> result = reportDataMapper.selectItemMoveWaitTime(paramMap); + return R.ok(result); + }catch (Exception e){ + return R.failed(e.getMessage()); + } + } + /** * 物料流转 * @param diff --git a/common/src/main/java/com/foreverwin/mesnac/common/ftp/WorkmanshipCardFtpClient.java b/common/src/main/java/com/foreverwin/mesnac/common/ftp/WorkmanshipCardFtpClient.java index 9f86ee27..93096923 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/ftp/WorkmanshipCardFtpClient.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/ftp/WorkmanshipCardFtpClient.java @@ -349,7 +349,7 @@ public class WorkmanshipCardFtpClient { public FTPClient login() throws IOException{ this.ftp=new FTPClient(); this.ftp.connect(address,port); - + this.ftp.setFileType(FTP.BINARY_FILE_TYPE); if(FTPReply.isPositiveCompletion(this.ftp.getReplyCode())){ if(this.ftp.login(userName, password)){ this.ftp.setControlEncoding("GBK"); diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java index b7bfca70..b5095f16 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java @@ -40,4 +40,6 @@ public interface ReportDataMapper { List> selectItemMoveData(Map paramMap); void doItemMove(@Param("site") String site, @Param("list") List list); + + List> selectItemMoveWaitTime(Map paramMap); } diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index 14dabde9..682b5111 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -790,6 +790,9 @@ GROUP BY "MONTH",WORK_CENTER,DESCRIPTION ORDER BY WORK_CENTER, "MONTH" + UPDATE Z_SFC_DISPATCH ZSD SET ZSD.OTHER_3 = 'true' WHERE ZSD.HANDLE IN diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml index d788b54b..35c037e9 100644 --- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml +++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml @@ -809,6 +809,7 @@ LEFT JOIN WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = 'ResourceBO:' || SD.SITE || ',' || SD.RESRCE LEFT JOIN WORK_CENTER WR ON WR.HANDLE = WCM.WORK_CENTER_BO + LEFT JOIN ROUTER RT ON SD.ROUTER_BO = RT.HANDLE WHERE SD.SITE = #{site} AND SD.HANDLE = #{HANDLE} @@ -865,7 +866,7 @@ AND SD.BLANKING_SIZE LIKE '%'||#{blankingSize}||'%' - AND SD.STEP_ID = #{step} + AND SD.STEP_ID like #{step}||'%' AND CP.ITEM = #{component} @@ -894,6 +895,9 @@ AND SD.DISPATCH_SEQ = #{dispatchSeq} + + AND RT.ROUTER_TYPE = 'C' + GROUP BY SD.HANDLE, SD.SITE, SD.SHOP_ORDER, SD.DISPATCH_NO, SD.ROUTER_BO, C2.VALUE, C1.VALUE, IM.HANDLE, IM.ITEM, IT.DESCRIPTION, SD.SFC, SD.DISPATCH_STATUS,SD.DRAWINGS_REVISION, @@ -913,6 +917,7 @@ WHERE WIP.IS_COMPLETED = #{isCompleted} + ORDER BY WIP.SHOP_ORDER,WIP.SFC,TO_NUMBER(WIP.DISPATCH_SEQ) asc @@ -971,23 +976,23 @@ AND ROWNUM=1 ORDER BY ACTUAL_COMPLETE_DATE DESC diff --git a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java index 57063480..97058a2d 100644 --- a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java +++ b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java @@ -733,7 +733,8 @@ public class InterfaceServiceImpl implements InterfaceService { } //工单创建 shopOrderMeService.createShopOrder(request); - } else { + } + else { //工单存在更新或者关闭 if ("504".equals(status)) { CloseShopOrderRequest request = new CloseShopOrderRequest(); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LogisticsTurnoverMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LogisticsTurnoverMapper.java index f16dd3e9..81f1eb3d 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LogisticsTurnoverMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LogisticsTurnoverMapper.java @@ -26,7 +26,7 @@ public interface LogisticsTurnoverMapper extends BaseMapper { List queryLogisticsTurnoverList(@Param("HJHJ") String HJHJ,@Param("HJXL") String HJXL,@Param("JJ") String JJ,@Param("WX") String WX,@Param("RC") String RC,@Param("ZP") String ZP); - LogisticsTurnover queryNewtistTurnoverTask(String InspectionTaskNo); + LogisticsTurnover queryNewtistTurnoverTask(String sfcDispatchBo); List selectlogisticsturnoverlist(LogisticsDto logisticsDto); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LogisticsTurnoverService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LogisticsTurnoverService.java index 3a4638a7..3a52b947 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LogisticsTurnoverService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LogisticsTurnoverService.java @@ -32,7 +32,7 @@ public interface LogisticsTurnoverService extends IService { List queryLogisticsTurnoverList(String HJHJ,String HJXL,String JJ,String WX,String RC,String ZP); - LogisticsTurnover queryNewtistTurnoverTask(String InspectionTaskNo); + LogisticsTurnover queryNewtistTurnoverTask(String sfcDispatchBo); IPage selectLogisticsDtoPage(FrontPage frontPage, LogisticsDto logisticsDto); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LogisticsTurnoverServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LogisticsTurnoverServiceImpl.java index 45f07d4a..df749902 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LogisticsTurnoverServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LogisticsTurnoverServiceImpl.java @@ -59,8 +59,8 @@ public class LogisticsTurnoverServiceImpl extends ServiceImpl SELECT - ZLT.HANDLE, - ZLT.TURNOVER_WORK_CENTER NEXT_WORK_CENTER, - WCT.DESCRIPTION TURNOVER_WORK_CENTER + * FROM - Z_LOGISTICS_TURNOVER ZLT - LEFT JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZLT.TURNOVER_WORK_CENTER - LEFT JOIN WORK_CENTER_T WCT ON WC.HANDLE = WCT.WORK_CENTER_BO + ( + SELECT + ZLT.HANDLE, + ZLT.TURNOVER_WORK_CENTER NEXT_WORK_CENTER, + WCT.DESCRIPTION TURNOVER_WORK_CENTER + FROM + Z_LOGISTICS_TURNOVER ZLT + LEFT JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZLT.TURNOVER_WORK_CENTER + LEFT JOIN WORK_CENTER_T WCT ON WC.HANDLE = WCT.WORK_CENTER_BO + WHERE + ZLT.SFC_DISPATCH_BO = #{sfcDispatchBo} + ORDER BY + ZLT.CREATED_DATE_TIME DESC + ) WHERE - ZLT.OTHER3=#{InspectionTaskNo} + ROWNUM = 1