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 89162c43..b0ab6527 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 @@ -361,12 +361,12 @@ public class AbnormalBillController { } - @GetMapping("/findResrceBySfc") - public R findResrceBySfc(SfcDispatchDto sfcDispatch){ + @GetMapping("/findResrceAndWorkCenterBySfc") + public R findResrceAndWorkCenterBySfc(SfcDispatchDto sfcDispatch){ try{ - return R.ok(sfcDispatchCommonService.findResrceBySfc(sfcDispatch)); + return R.ok(sfcDispatchCommonService.findResrceAndWorkCenterBySfc(sfcDispatch)); }catch (Exception e){ - return R.failed("根据sfc查找设备失败:"+e.getMessage()); + return R.failed("根据sfc查找设备和工作中心失败:"+e.getMessage()); } } 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 c01e2eba..007188e7 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 @@ -10,7 +10,6 @@ import com.foreverwin.mesnac.anomaly.dto.PartsManufacturing; import com.foreverwin.mesnac.anomaly.service.ReportService; import com.foreverwin.mesnac.integration.model.IntegrationLog; import com.foreverwin.modular.core.util.CommonMethods; -import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -82,4 +81,6 @@ public class ReportController { return R.failed(e.getMessage()); } } + + } 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 0ca38386..80672bcb 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 @@ -1,6 +1,5 @@ package com.foreverwin.mesnac.anomaly.service.impl; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.foreverwin.mesnac.anomaly.dto.PartsManufacturing; import com.foreverwin.mesnac.anomaly.mapper.ReportMapper; import com.foreverwin.mesnac.anomaly.service.ReportService; @@ -61,6 +60,12 @@ public class ReportServiceImpl implements ReportService { return reportMapper.partsManufacturing(site,locale,partsManufacturing); } + /** + * 余料退回明细表 + * @param item + * @param itemDescription + * @return + */ @Override public List> surplusReturnTable(String item, String itemDescription) { String locale = LocaleContextHolder.getLocale().getLanguage(); @@ -68,13 +73,16 @@ public class ReportServiceImpl implements ReportService { return reportMapper.surplusReturnTable(site,locale,item,itemDescription); } + /** + * 资源维修报表 + * @param map + * @return + */ @Override public List> resourceRepair(Map map) { String locale = LocaleContextHolder.getLocale().getLanguage(); String site = CommonMethods.getSite(); - - Map> ncCodeMap = new HashMap<>(); NcCode ncCode = new NcCode(); ncCode.setSite(site); @@ -132,6 +140,11 @@ public class ReportServiceImpl implements ReportService { return maps; } + /** + * 检验记录报表 + * @param paramMap + * @return + */ @Override public List> findInspectionTask(Map paramMap) { return reportMapper.findInspectionTask(paramMap); diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index 4898d922..20580a3f 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -942,9 +942,18 @@ AND zab.ABNORMAL_NO = #{abnormalBill.abnormalNo} - + AND zab.STATUS = #{abnormalBill.status} + + AND zab.PROGRAM IS NULL + + + AND zab.CORRECTION IS NULL + + + AND zab.PROGRAM = 'true' AND zab.CORRECTION = 'true' AND zab.status != 'G' + AND zab.CREATED_DATE_TIME >= #{abnormalBill.startDateTime} diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java index d576e969..2a9749f5 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java @@ -49,6 +49,8 @@ public class LabelPrintDto implements Serializable { private String operation; //打印张数 private Integer printNum; + //是否主观件 + private String mainPart; public String getItemNumber() { return itemNumber; @@ -201,4 +203,12 @@ public class LabelPrintDto implements Serializable { public void setPrintNum(Integer printNum) { this.printNum = printNum; } + + public String getMainPart() { + return mainPart; + } + + public void setMainPart(String mainPart) { + this.mainPart = mainPart; + } } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java index 12d95b2c..9b85e83a 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java @@ -43,7 +43,7 @@ public interface SfcDispatchCommonService { * @param sfcDispatch * @return */ - SfcDispatchDto findResrceBySfc(SfcDispatchDto sfcDispatch); + SfcDispatchDto findResrceAndWorkCenterBySfc(SfcDispatchDto sfcDispatch); /** * 查询派工单 diff --git a/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java b/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java index b6244cf3..97478976 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java @@ -2,6 +2,7 @@ package com.foreverwin.mesnac.common.util; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.jms.core.JmsMessagingTemplate; import org.springframework.stereotype.Component; @@ -15,6 +16,7 @@ public class ActiveMQUtil { @Autowired + @Qualifier("mesJmsTemplate") private JmsMessagingTemplate mesJmsTemplate; public void wechatSendMessage(String user, String text) { diff --git a/console/src/main/resources/application-dev.yml b/console/src/main/resources/application-dev.yml index a82f4ead..eb3d1be8 100644 --- a/console/src/main/resources/application-dev.yml +++ b/console/src/main/resources/application-dev.yml @@ -8,14 +8,23 @@ spring: driver-class-name: com.sap.db.jdbc.Driver jndi-name: jdbc/jts/wipPool activemq: - enabled: false - brokerUrl: tcp://121.36.58.109:61616?wireFormat.maxInactivityDuration=0 + enabled: true + brokerUrl: tcp://113.98.201.217:61616?wireFormat.maxInactivityDuration=0 password: admin user: admin pool: enabled: true max-connections: 10 +#发送消息 +activemq: + brokerUrl: tcp://113.98.201.217:61616?wireFormat.maxInactivityDuration=0 + password: admin + user: admin + pool: + enabled: true + max-connections: 10 + #WebService ws: erp: @@ -40,9 +49,7 @@ print: quartz: enabled: true -activeMq: - sendWeChatMessage: tcp://localhost:61616?wireFormat.maxInactivityDuration=0 - queue: send.weChat.notice + exportDocument: filePath: /usr/word/ outputPath: /usr/word/outputWord/ diff --git a/console/src/main/resources/application-local.yml b/console/src/main/resources/application-local.yml index 31b82509..4459c48e 100644 --- a/console/src/main/resources/application-local.yml +++ b/console/src/main/resources/application-local.yml @@ -66,7 +66,7 @@ ws: #quartz任务启用 quartz: - enabled: false + enabled: true #打印服务器配置 print: diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java index fd7366f3..4ca9ed10 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java @@ -53,7 +53,7 @@ public interface SfcDispatchMapper extends BaseMapper { * @param site * @return */ - SfcDispatchDto findResrceBySfc(@Param("sfcDispatch")SfcDispatchDto sfcDispatch, @Param("site") String site); + SfcDispatchDto findResrceAndWorkCenterBySfc(@Param("sfcDispatch")SfcDispatchDto sfcDispatch, @Param("site") String site); SfcDispatchDto findSfcDispatchBySfc(@Param("site")String site, @Param("dto")SfcDispatchDto sfcDispatch); diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index 493b80f6..1192b2e5 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java @@ -691,10 +691,9 @@ public class SfcDispatchServiceImpl extends ServiceImpl - + SELECT ZSD2.RESRCE,ZSD2.WORK_CENTER WORK_CENTER FROM SFC S INNER JOIN SFC_ROUTING SR ON SR.SFC_BO = S.HANDLE INNER JOIN SFC_ROUTER ST ON ST.SFC_ROUTING_BO = SR.HANDLE INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = ST.HANDLE AND (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0) LEFT JOIN Z_SFC_DISPATCH ZSD2 ON ZSD2.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID WHERE S.SITE = #{site} - AND ZSD2.RESRCE IS NOT NULL AND S.SFC = #{sfcDispatch.sfc} + AND S.SFC = #{sfcDispatch.sfc}