From b3027b8b1e412a48dbdea551621725c9c2cc6eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Sat, 21 Aug 2021 13:17:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=B6=88=E6=81=AF=E5=8F=91?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AbnormalBillController.java | 6 +- .../anomaly/dto/AbnormalBillDisposeDto.java | 53 ++++++++++ .../anomaly/service/AbnormalBillService.java | 4 +- .../anomaly/service/AbnormalCauseService.java | 4 + .../anomaly/service/AbnormalDutyService.java | 5 +- .../impl/AbnormalBillLogServiceImpl.java | 14 +-- .../service/impl/AbnormalBillServiceImpl.java | 99 ++++++------------- .../impl/AbnormalCauseServiceImpl.java | 55 ++++++++++- .../service/impl/AbnormalDutyServiceImpl.java | 53 +++++++++- .../mapper/AbnormalBillDisposeMapper.xml | 12 ++- .../mesnac/common/config/ActiveMQConfig.java | 26 +++++ .../mesnac/common/enums/AnomalyConstant.java | 45 +++++++++ .../mesnac/common/service/AnomalyService.java | 1 + .../meapi/mapper/DataFieldListMapper.java | 2 + .../mesnac/meapi/model/DataField.java | 15 ++- .../resources/mapper/DataFieldListMapper.xml | 27 +++++ 16 files changed, 327 insertions(+), 94 deletions(-) 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 4e4aab9c..ca439de2 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 @@ -295,8 +295,10 @@ public class AbnormalBillController { * @return */ @GetMapping("/dutyConfirm") - public R dutyConfirm(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose){ - abnormalBillService.dutyConfirm(abnormalBill,abnormalBillDispose); + public R dutyConfirm(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose, + @RequestParam List dutyCauseType, + @RequestParam List dutyType){ + abnormalBillService.dutyConfirm(abnormalBill,abnormalBillDispose,dutyCauseType,dutyType); return R.ok(); } 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 d23df37a..9a5539b5 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 @@ -179,6 +179,21 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose { */ private String program; + /** + * 原因分类 + */ + private String causeType; + + /** + * 责任部门 + */ + private String dutyDepart; + + /** + * 责任分类 + */ + private String dutyType; + /** * * @return @@ -191,6 +206,8 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose { private String operationDescription; + private String routerDescription;; + public String getAbnormalNo() { return abnormalNo; } @@ -494,4 +511,40 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose { public void setOperationDescription(String operationDescription) { this.operationDescription = operationDescription; } + + public String getCauseType() { + return causeType; + } + + public void setCauseType(String causeType) { + this.causeType = causeType; + } + + @Override + public String getDutyDepart() { + return dutyDepart; + } + + @Override + public void setDutyDepart(String dutyDepart) { + this.dutyDepart = dutyDepart; + } + + @Override + public String getDutyType() { + return dutyType; + } + + @Override + public void setDutyType(String dutyType) { + this.dutyType = dutyType; + } + + public String getRouterDescription() { + return routerDescription; + } + + public void setRouterDescription(String routerDescription) { + this.routerDescription = routerDescription; + } } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java index 23049682..f8294323 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java @@ -92,7 +92,9 @@ public interface AbnormalBillService extends IService { * 判责提交 * @param abnormalBill */ - void dutyConfirm(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose); + void dutyConfirm(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose, + List dutyCauseType, + List dutyType); /** * 闭环关闭 diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalCauseService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalCauseService.java index 35687c73..60fa6bd4 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalCauseService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalCauseService.java @@ -1,6 +1,8 @@ package com.foreverwin.mesnac.anomaly.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.anomaly.model.AbnormalBill; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; import com.foreverwin.mesnac.anomaly.model.AbnormalCause; import com.baomidou.mybatisplus.extension.service.IService; import com.foreverwin.modular.core.util.FrontPage; @@ -25,4 +27,6 @@ public interface AbnormalCauseService extends IService { IPage selectPage(FrontPage frontPage, AbnormalCause abnormalCause); List selectList(AbnormalCause abnormalCause); + + void insertByAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List dutyCauseType); } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalDutyService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalDutyService.java index becbc7ef..7a82a6cb 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalDutyService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalDutyService.java @@ -1,8 +1,10 @@ package com.foreverwin.mesnac.anomaly.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.anomaly.model.AbnormalDuty; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.anomaly.model.AbnormalBill; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import com.foreverwin.mesnac.anomaly.model.AbnormalDuty; import com.foreverwin.modular.core.util.FrontPage; import java.util.List; @@ -26,4 +28,5 @@ public interface AbnormalDutyService extends IService { List selectList(AbnormalDuty abnormalDuty); + void insertByAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose, List dutyType); } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java index 366c9fe4..8ade73d2 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java @@ -14,7 +14,6 @@ import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.meapi.mapper.ShopOrderMapper; -import com.foreverwin.mesnac.meapi.model.NwaUser; import com.foreverwin.mesnac.meapi.model.Router; import com.foreverwin.mesnac.meapi.model.ShopOrder; import com.foreverwin.mesnac.meapi.service.NwaUserService; @@ -117,10 +116,13 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl nwaUsers = nwaUserService.checkUserGroup(site, resolveSendUserGroup); - - + if(!StringUtil.isBlank(abnormalBill.getReportSendUserGroup())){ + nwaUserService.checkUserGroup(site, abnormalBill.getReportSendUserGroup()); + }else if(!StringUtil.isBlank(abnormalBillDispose.getDutySendUserGroup())){ + nwaUserService.checkUserGroup(site, abnormalBillDispose.getDutySendUserGroup()); + }else if(!StringUtil.isBlank(abnormalBillDispose.getResolveSendUserGroup())){ + nwaUserService.checkUserGroup(site, abnormalBillDispose.getResolveSendUserGroup()); + } if(abnormalBillLogMapper.selectById(abnormalBillLog.getHandle()) == null){ //根据abnormalNo找到不合格代码组 @@ -170,8 +172,6 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl dutyCauseType, + List dutyType) { String site = CommonMethods.getSite(); String user = CommonMethods.getUser(); LocalDateTime now = LocalDateTime.now(); @@ -451,7 +460,13 @@ public class AbnormalBillServiceImpl extends ServiceImpl causeTypes = new ArrayList<>(); - if(dutyCauseType != null && dutyCauseType.size() >= 1){ - for(String cause:dutyCauseType){ - AbnormalCause abnormalCause = new AbnormalCause(); - String uuid = UUID.randomUUID().toString(); - abnormalCause.setSite(site); - abnormalCause.setAbnormalBillBo(abnormalBill.getHandle()); - abnormalCause.setAbnormalBillDisposeBo(abnormalBillDispose.getHandle()); - List abnormalCauses = abnormalCauseService.selectList(abnormalCause); - if(abnormalCauses.size() != 0){ - QueryWrapper abnormalCauseQueryWrapper = new QueryWrapper<>(); - abnormalCauseQueryWrapper.setEntity(abnormalCause); - abnormalCauseService.remove(abnormalCauseQueryWrapper); - } - abnormalCause.setHandle(uuid); - abnormalCause.setAbnormalCauseNo(cause); - abnormalCause.setCreatedDateTime(currentTime); - abnormalCause.setCreatedUser(user); - abnormalCause.setModifiedUser(user); - abnormalCause.setModifiedDateTime(currentTime); - causeTypes.add(abnormalCause); - } - } + //插入原因分类和责任分类 + abnormalCauseService.insertByAbnormalBill(abnormalBill,abnormalBillDispose,dutyCauseType); + abnormalDutyService.insertByAbnormalBill(abnormalBill,abnormalBillDispose,dutyType); //判断工序编号是否传递错误 @@ -591,32 +584,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl dutyTypes = new ArrayList<>(); - //判断责任分类是否为空,如果不为空，把它放进Z_ABNORMAL_DUTY表里面 - if(dutyType != null && dutyType.size() >= 1){ - for(String duty:dutyType){ - AbnormalDuty abnormalDuty = new AbnormalDuty(); - String uuid = UUID.randomUUID().toString(); - abnormalDuty.setSite(site); - abnormalDuty.setAbnormalBillBo(abnormalBill.getHandle()); - abnormalDuty.setAbnormalBillDisposeBo(abnormalBillDispose.getHandle()); - List abnormalDuties = abnormalDutyService.selectList(abnormalDuty); - if(abnormalDuties.size() != 0){ - QueryWrapper abnormalDutyQueryWrapper = new QueryWrapper<>(); - abnormalDutyQueryWrapper.setEntity(abnormalDuty); - abnormalDutyService.remove(abnormalDutyQueryWrapper); - } - abnormalDuty.setHandle(uuid); - abnormalDuty.setAbnormalDutyNo(duty); - abnormalDuty.setModifiedUser(user); - abnormalDuty.setModifiedDateTime(currentTime); - abnormalDuty.setCreatedDateTime(currentTime); - abnormalDuty.setCreatedUser(user); - dutyTypes.add(abnormalDuty); - } - } - - /** * 判断SFC ，设备异常提交，sfc可以为空 * 设备编号 @@ -679,16 +646,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl 0){ - abnormalDutyService.saveOrUpdateBatch(dutyTypes); - } - if(causeTypes.size() > 0){ - abnormalCauseService.saveOrUpdateBatch(causeTypes); - } if(!StringUtil.isBlank(abnormalBill.getFileName())){ //放置图片 this.fileUpload(abnormalBill); @@ -1075,7 +1034,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl dutyCauseTypeList = Arrays.asList(dutyCauseType.split(",")); dataField.setDataField("REASON_CATEGORY"); @@ -1118,7 +1077,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl dutyTypeList = Arrays.asList(dutyType.split(",")); dataField.setDataField("RESPONSIBILITY_TYPE"); @@ -1128,15 +1087,15 @@ public class AbnormalBillServiceImpl extends ServiceImpl list = userService.findList(messageContent.getPrincipalUser()); - if(list.size() > 0){ - messageMap.put("principalUser",list.get(0).getFullName()); - } + messageMap.put("principalUser",messageContent.getPrincipalUser()); messageMap.put("dutyCauseDescription",messageContent.getDutyCauseDescription()); } if(Constants.PROGRAM_CONFIRM.equals(messageContent.getStatus())){ - + messageMap.put("abnormalMethod",AnomalyConstant.AnomalyMethod.msg(messageContent.getAbnormalMethod())); + messageMap.put("resolveRemark",messageContent.getResolveRemark()); + messageMap.put("router",messageContent.getRouterDescription()); + messageMap.put("resolveShopOrder",messageContent.getResolveShopOrder()); } //格式化之后的消息 diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalCauseServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalCauseServiceImpl.java index da36afac..85b092fe 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalCauseServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalCauseServiceImpl.java @@ -1,17 +1,25 @@ package com.foreverwin.mesnac.anomaly.service.impl; -import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.anomaly.model.AbnormalCause; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.mesnac.anomaly.mapper.AbnormalCauseMapper; +import com.foreverwin.mesnac.anomaly.model.AbnormalBill; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import com.foreverwin.mesnac.anomaly.model.AbnormalCause; import com.foreverwin.mesnac.anomaly.service.AbnormalCauseService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; +import com.foreverwin.modular.core.util.CommonMethods; +import com.foreverwin.modular.core.util.FrontPage; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.UUID; + /** *

* 异常原因 服务实现类 @@ -42,5 +50,44 @@ public class AbnormalCauseServiceImpl extends ServiceImpl dutyCauseType) { + + String site = CommonMethods.getSite(); + String user = CommonMethods.getUser(); + LocalDateTime now = LocalDateTime.now(); + //判断原因分类是否为空,如果不为空，把它放进Z_ABNORMAL_CAUSE表里面，先删除，后保存 + ArrayList causeTypes = new ArrayList<>(); + HashMap hashMap = new HashMap<>(); + hashMap.put("ABNORMAL_BILL_BO",abnormalBill.getHandle()); + hashMap.put("ABNORMAL_BILL_DISPOSE_BO",abnormalBillDispose.getHandle()); + abnormalCauseMapper.deleteByMap(hashMap); + if(dutyCauseType != null && dutyCauseType.size() >= 1){ + for(String cause:dutyCauseType){ + AbnormalCause abnormalCause = new AbnormalCause(); + String uuid = UUID.randomUUID().toString();; + abnormalCause.setSite(site); + abnormalCause.setAbnormalBillBo(abnormalBill.getHandle()); + abnormalCause.setAbnormalBillDisposeBo(abnormalBillDispose.getHandle()); + // List abnormalCauses = abnormalCauseService.selectList(abnormalCause); +// if(abnormalCauses.size() != 0){ +// QueryWrapper abnormalCauseQueryWrapper = new QueryWrapper<>(); +// abnormalCauseQueryWrapper.setEntity(abnormalCause); +// abnormalCauseService.remove(abnormalCauseQueryWrapper); +// } + abnormalCause.setHandle(uuid); + abnormalCause.setAbnormalCauseNo(cause); + abnormalCause.setCreatedDateTime(now); + abnormalCause.setCreatedUser(user); + abnormalCause.setModifiedUser(user); + abnormalCause.setModifiedDateTime(now); + causeTypes.add(abnormalCause); + } + } + if(causeTypes.size() > 0){ + this.saveOrUpdateBatch(causeTypes); + } + } + } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalDutyServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalDutyServiceImpl.java index 3352485a..dbba1cf9 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalDutyServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalDutyServiceImpl.java @@ -1,17 +1,25 @@ package com.foreverwin.mesnac.anomaly.service.impl; -import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.anomaly.model.AbnormalDuty; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.mesnac.anomaly.mapper.AbnormalDutyMapper; +import com.foreverwin.mesnac.anomaly.model.AbnormalBill; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import com.foreverwin.mesnac.anomaly.model.AbnormalDuty; import com.foreverwin.mesnac.anomaly.service.AbnormalDutyService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; +import com.foreverwin.modular.core.util.CommonMethods; +import com.foreverwin.modular.core.util.FrontPage; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.UUID; + /** *

* 责任分类 服务实现类 @@ -42,7 +50,44 @@ public class AbnormalDutyServiceImpl extends ServiceImpl dutyType) { + String site = CommonMethods.getSite(); + String user = CommonMethods.getUser(); + LocalDateTime now = LocalDateTime.now(); + ArrayList dutyTypes = new ArrayList<>(); + HashMap hashMap = new HashMap<>(); + hashMap.put("ABNORMAL_BILL_BO",abnormalBill.getHandle()); + hashMap.put("ABNORMAL_BILL_DISPOSE_BO",abnormalBillDispose.getHandle()); + abnormalDutyMapper.deleteByMap(hashMap); + //判断责任分类是否为空,如果不为空，把它放进Z_ABNORMAL_DUTY表里面 + if(dutyType != null && dutyType.size() >= 1){ + for(String duty:dutyType){ + AbnormalDuty abnormalDuty = new AbnormalDuty(); + String uuid = UUID.randomUUID().toString(); + abnormalDuty.setSite(site); + abnormalDuty.setAbnormalBillBo(abnormalBill.getHandle()); + abnormalDuty.setAbnormalBillDisposeBo(abnormalBillDispose.getHandle()); + // List abnormalDuties = abnormalDutyService.selectList(abnormalDuty); +// if(abnormalDuties.size() != 0){ +// QueryWrapper abnormalDutyQueryWrapper = new QueryWrapper<>(); +// abnormalDutyQueryWrapper.setEntity(abnormalDuty); +// abnormalDutyService.remove(abnormalDutyQueryWrapper); +// } + abnormalDuty.setHandle(uuid); + abnormalDuty.setAbnormalDutyNo(duty); + abnormalDuty.setModifiedUser(user); + abnormalDuty.setModifiedDateTime(now); + abnormalDuty.setCreatedDateTime(now); + abnormalDuty.setCreatedUser(user); + dutyTypes.add(abnormalDuty); + } + } + if(dutyTypes.size() > 0){ + this.saveOrUpdateBatch(dutyTypes); + } + } } \ No newline at end of file diff --git a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml index 89e17ec0..0e8b2a1d 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml @@ -74,6 +74,10 @@ + + + + @@ -718,12 +722,12 @@ listagg(ZANC.NC_CODE_GROUP || '/'||ZANC.NC_CODE || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE, ZABD.ROUTER_BO ROUTER_BO,ZAB.OPERATION OPERATION,I.HANDLE ITEM_BO,ZAB.REPORT_SEND_USER_GROUP REPORT_SEND_USER_GROUP, ZAB.CORRECTION CORRECTION,ZAB.PROGRAM PROGRAM,WCT.DESCRIPTION WORK_CENTER_DESCRIPTION,ZAB.SHUT_DOWN SHUT_DOWN, - RS.DESCRIPTION RESRCE_DESCRIPTION,OT.DESCRIPTION OPERATION_DESCRIPTION + RS.DESCRIPTION RESRCE_DESCRIPTION,OT.DESCRIPTION OPERATION_DESCRIPTION,R.DESCRIPTION ROUTER_DESCRIPTION FROM Z_ABNORMAL_BILL ZAB LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZAB.HANDLE = ZABD.ABNORMAL_BILL_BO - INNER JOIN ITEM I ON I.HANDLE = ZAB.ITEM_BO + LEFT JOIN ITEM I ON I.HANDLE = ZAB.ITEM_BO LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = #{locale} - INNER JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZAB.SHOP_ORDER AND SO.SITE = ZAB.SITE + LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZAB.SHOP_ORDER AND SO.SITE = ZAB.SITE LEFT JOIN RESRCE RS ON RS.RESRCE = ZAB.RESRCE AND RS.SITE = ZAB.SITE LEFT JOIN OPERATION O ON O.OPERATION = ZAB.OPERATION AND O.SITE = ZAB.SITE AND O.CURRENT_REVISION = 'true' LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO AND OT.LOCALE = #{locale} @@ -760,7 +764,7 @@ R.ROUTER ,ZABD.RESOLVE_SHOP_ORDER ,ZABD.RESOLVE_REMARK ,ZABD.RESOLVE_SEND_USER_GROUP , ZABD.ABNORMAL_REASON ,ZABD.BEFORE_MEASURE ,"MAP".VALUE,ZABD.ROUTER_BO,ZAB.OPERATION,I.HANDLE, ZAB.REPORT_SEND_USER_GROUP,ZAB.CORRECTION,ZAB.PROGRAM,WCT.DESCRIPTION,ZAB.SHUT_DOWN,RS.DESCRIPTION, - OT.DESCRIPTION + OT.DESCRIPTION,R.DESCRIPTION diff --git a/common/src/main/java/com/foreverwin/mesnac/common/config/ActiveMQConfig.java b/common/src/main/java/com/foreverwin/mesnac/common/config/ActiveMQConfig.java index 569df7ec..8eca0670 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/config/ActiveMQConfig.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/config/ActiveMQConfig.java @@ -27,6 +27,15 @@ public class ActiveMQConfig { return this.createConnectionFactory(brokerUrl, username, password); } + @Bean(name = "mesConnectionFactory") + public ActiveMQConnectionFactory mesConnectionFactory( + @Value("${activemq.brokerUrl}") String brokerUrl, + @Value("${activemq.user}") String username, + @Value("${activemq.password}") String password) { + + return this.createConnectionFactory(brokerUrl, username, password); + } + private ActiveMQConnectionFactory createConnectionFactory (String brokerUrl, String username, String password) { ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(); @@ -46,6 +55,14 @@ public class ActiveMQConfig { return template; } + @Bean(name = "mesJmsTemplate") + public JmsMessagingTemplate mesJmsTemplate( + @Qualifier("mesConnectionFactory") ActiveMQConnectionFactory connectionFactory) { + + JmsMessagingTemplate template = new JmsMessagingTemplate(connectionFactory); + return template; + } + //☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆☆ @Primary @@ -57,4 +74,13 @@ public class ActiveMQConfig { factory.setConnectionFactory(connectionFactory); return factory; } + + @Bean(name = "mesFactory") + public JmsListenerContainerFactory mesFactory( + @Qualifier("mesConnectionFactory") ActiveMQConnectionFactory connectionFactory) { + + DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory(); + factory.setConnectionFactory(connectionFactory); + return factory; + } } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/enums/AnomalyConstant.java b/common/src/main/java/com/foreverwin/mesnac/common/enums/AnomalyConstant.java index 7238ad3f..cf149fdc 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/enums/AnomalyConstant.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/enums/AnomalyConstant.java @@ -218,4 +218,49 @@ public enum AnomalyConstant { } } + public enum AnomalyMethod{ + AnomalyMethod1("X","线下换料"), + AnomalyMethod2("S","试装"), + AnomalyMethod3("R","让步放心"), + AnomalyMethod4("C","产品报废"), + AnomalyMethod5("P","配作"), + AnomalyMethod6("F","返修"); + + + + private String code; + private String msg; + + AnomalyMethod(String code, String msg) { + this.code = code; + this.msg = msg; + } + + public static String msg(String code) { + AnomalyMethod[] anomalyMethods = values(); + for (AnomalyMethod anomalyMethod : anomalyMethods) { + if (anomalyMethod.getCode().equals(code)) { + return anomalyMethod.getMsg(); + } + } + return ""; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + } + } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java index 8952f968..5424f0e1 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java @@ -36,4 +36,5 @@ public interface AnomalyService { * 检索 */ List getScrapDtoBysfc(String site, String sfc); + } diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java index 7a75e8ca..86dbb429 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java @@ -26,4 +26,6 @@ public interface DataFieldListMapper extends BaseMapper { */ List findDataFieldListById(@Param("dataField") DataField dataField,@Param("locale")String locale); + String findDataFieldListByDataField(@Param("dataField") DataField dataField,@Param("locale")String locale); + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataField.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataField.java index 2447e486..e51fc603 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataField.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataField.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.List; /** *

@@ -55,6 +56,10 @@ public class DataField extends Model { @TableField("CATEGORY") private String category; + //数据字段定义维护中的数据字段 + @TableField(exist = false) + private List dataValue; + public String getHandle() { return handle; @@ -184,7 +189,15 @@ public class DataField extends Model { this.category = category; } -public static final String HANDLE = "HANDLE"; + public List getDataValue() { + return dataValue; + } + + public void setDataValue(List dataValue) { + this.dataValue = dataValue; + } + + public static final String HANDLE = "HANDLE"; public static final String DATA_TYPE_BO = "DATA_TYPE_BO"; diff --git a/meapi/src/main/resources/mapper/DataFieldListMapper.xml b/meapi/src/main/resources/mapper/DataFieldListMapper.xml index 7ef7ec3e..10740ecf 100644 --- a/meapi/src/main/resources/mapper/DataFieldListMapper.xml +++ b/meapi/src/main/resources/mapper/DataFieldListMapper.xml @@ -359,6 +359,33 @@ AND DF.DATA_FIELD = #{dataField.dataField} + + + + +