From a9854cfc636ff81f9988ba96fb608f65d040c7cd Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Fri, 3 Sep 2021 16:28:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=B8=93=E6=A3=80=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AbnormalBillServiceImpl.java | 70 +++++++++++++++++-- 1 file changed, 64 insertions(+), 6 deletions(-) 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 271e33b6..afc6bd9a 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 @@ -8,21 +8,24 @@ import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDisposeDto; import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto; import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillDisposeMapper; import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillMapper; -import com.foreverwin.mesnac.anomaly.mapper.AbnormalCauseMapper; -import com.foreverwin.mesnac.anomaly.model.*; +import com.foreverwin.mesnac.anomaly.model.AbnormalBill; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import com.foreverwin.mesnac.anomaly.model.AbnormalNcCode; +import com.foreverwin.mesnac.anomaly.model.UploadPictures; import com.foreverwin.mesnac.anomaly.service.*; import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.dto.ScrapDto; +import com.foreverwin.mesnac.common.dto.SfcDispatchDto; import com.foreverwin.mesnac.common.dto.UsrDto; import com.foreverwin.mesnac.common.enums.AnomalyConstant; import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.helper.NextNumberHelper; import com.foreverwin.mesnac.common.mapper.MessageMapper; +import com.foreverwin.mesnac.common.model.InspectionTask; import com.foreverwin.mesnac.common.model.Message; -import com.foreverwin.mesnac.common.service.AnomalyService; -import com.foreverwin.mesnac.common.service.MessageService; -import com.foreverwin.mesnac.common.service.UserService; +import com.foreverwin.mesnac.common.service.*; import com.foreverwin.mesnac.common.util.ActiveMQUtil; +import com.foreverwin.mesnac.common.util.DateUtil; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.meapi.dto.NcCodeDto; import com.foreverwin.mesnac.meapi.mapper.*; @@ -36,11 +39,13 @@ import com.foreverwin.modular.core.exception.BaseException; import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.*; @@ -142,11 +147,13 @@ public class AbnormalBillServiceImpl extends ServiceImpl Date: Fri, 3 Sep 2021 17:10:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8F=91=E9=80=81=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anomaly/pom.xml | 4 ++++ .../service/impl/AbnormalBillServiceImpl.java | 16 ++++++++++++---- .../mesnac/listener/mapper/UsrMapper.java | 4 ++++ listener/src/main/resources/mapper/UsrMapper.xml | 15 +++++++++++++++ 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/anomaly/pom.xml b/anomaly/pom.xml index 9afd3d68..1e828357 100644 --- a/anomaly/pom.xml +++ b/anomaly/pom.xml @@ -80,6 +80,10 @@ com.foreverwin.mesnac quality + + com.foreverwin.mesnac + listener + org.springframework.boot spring-boot-starter-quartz 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 afc6bd9a..fe82597d 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 @@ -27,6 +27,7 @@ import com.foreverwin.mesnac.common.service.*; import com.foreverwin.mesnac.common.util.ActiveMQUtil; import com.foreverwin.mesnac.common.util.DateUtil; import com.foreverwin.mesnac.common.util.StringUtil; +import com.foreverwin.mesnac.listener.mapper.UsrMapper; import com.foreverwin.mesnac.meapi.dto.NcCodeDto; import com.foreverwin.mesnac.meapi.mapper.*; import com.foreverwin.mesnac.meapi.model.*; @@ -155,6 +156,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, AbnormalBill abnormalBill) { @@ -1056,12 +1060,16 @@ public class AbnormalBillServiceImpl extends ServiceImpl customFieldByUserId = usrMapper.findCustomFieldByUserId(site, nwaUsers); + if(customFieldByUserId != null && customFieldByUserId.size() <= 0){ + throw new BaseException("消息发送失败，发送的用户组下面的自定义数据没有维护"); + } StringBuilder sendUsers = new StringBuilder(); - for (int i = 0; i < nwaUsers.size(); i++) { - if(i == (nwaUsers.size() - 1)){ - sendUsers.append(nwaUsers.get(i).getUserName()); + for (int i = 0; i < customFieldByUserId.size(); i++) { + if(i == (customFieldByUserId.size() - 1)){ + sendUsers.append(customFieldByUserId.get(i)); }else{ - sendUsers.append(nwaUsers.get(i).getUserName()).append("|"); + sendUsers.append(customFieldByUserId.get(i)).append("|"); } } activeMQUtil.wechatSendMessage(sendUsers.toString(),abnormalMessage.getContent()); diff --git a/listener/src/main/java/com/foreverwin/mesnac/listener/mapper/UsrMapper.java b/listener/src/main/java/com/foreverwin/mesnac/listener/mapper/UsrMapper.java index 3eda5db2..6bfb02ca 100644 --- a/listener/src/main/java/com/foreverwin/mesnac/listener/mapper/UsrMapper.java +++ b/listener/src/main/java/com/foreverwin/mesnac/listener/mapper/UsrMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.common.dto.UsrDto; import com.foreverwin.mesnac.listener.model.SysUser; import com.foreverwin.mesnac.listener.model.Usr; +import com.foreverwin.mesnac.meapi.model.NwaUser; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -27,4 +28,7 @@ public interface UsrMapper extends BaseMapper { IPage findPage(IPage page,@Param("site")String site,@Param("user")String user); + List findCustomFieldByUserId(@Param("site")String site, @Param("userList")List userList); + + } \ No newline at end of file diff --git a/listener/src/main/resources/mapper/UsrMapper.xml b/listener/src/main/resources/mapper/UsrMapper.xml index f61d2226..7be74906 100644 --- a/listener/src/main/resources/mapper/UsrMapper.xml +++ b/listener/src/main/resources/mapper/UsrMapper.xml @@ -32,6 +32,7 @@ + @@ -636,4 +637,18 @@ ) + + From 5b4077faac53b092e3b8ad008f808319b4bf14fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Fri, 3 Sep 2021 17:11:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8F=91=E9=80=81=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/foreverwin/mesnac/common/dto/UsrDto.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/UsrDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/UsrDto.java index f87af383..46adc93a 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/UsrDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/UsrDto.java @@ -11,6 +11,8 @@ public class UsrDto { private String fullName; + private String wechatId; + public String getUserName() { return userName; } @@ -26,4 +28,12 @@ public class UsrDto { public void setFullName(String fullName) { this.fullName = fullName; } + + public String getWechatId() { + return wechatId; + } + + public void setWechatId(String wechatId) { + this.wechatId = wechatId; + } } From 07d56fc140946cd74ab34e6751d2c3972a17181d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Fri, 3 Sep 2021 17:12:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anomaly/controller/ReportController.java | 15 +++++ .../mesnac/anomaly/mapper/ReportMapper.java | 7 ++ .../mesnac/anomaly/service/ReportService.java | 7 ++ .../service/impl/ReportServiceImpl.java | 18 +++++ .../main/resources/mapper/ReportMapper.xml | 66 +++++++++++++++++++ 5 files changed, 113 insertions(+) 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 579ce61f..498cd634 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 @@ -95,4 +95,19 @@ public class ReportController { return R.failed(e.getMessage()); } } + + /** + * 质检问题统计表 + * @param paramMap + * @return + */ + @PostMapping("/findQualityInspectionReport") + public R findQualityInspectionReport(@RequestBody(required = false) Map paramMap) { + try{ + List> result = reportService.findQualityInspectionReport(paramMap); + return R.ok(result); + }catch (Exception e){ + return R.failed(e.getMessage()); + } + } } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java index e651f1ba..cc526a4c 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java @@ -27,4 +27,11 @@ public interface ReportMapper { List> findInspectionTask(Map paramMap); + + /** + * 查询质检问题统计表 + * @param paramMap + * @return + */ + List> findQualityInspectionReport(Map paramMap); } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java index 55bd2772..2a27f874 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java @@ -26,4 +26,11 @@ public interface ReportService { * @return */ List> findInspectionTask(Map paramMap); + + /** + * 查询质检问题统计表 + * @param paramMap + * @return + */ + List> findQualityInspectionReport(Map paramMap); } 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 93451546..ee76a14a 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 @@ -5,6 +5,7 @@ import com.foreverwin.mesnac.anomaly.mapper.ReportMapper; import com.foreverwin.mesnac.anomaly.service.ReportService; import com.foreverwin.mesnac.meapi.model.NcCode; import com.foreverwin.mesnac.meapi.model.NwaUser; +import com.foreverwin.mesnac.meapi.service.DataFieldListService; import com.foreverwin.mesnac.meapi.service.NcCodeService; import com.foreverwin.mesnac.meapi.service.NwaUserService; import com.foreverwin.mesnac.meapi.util.StringUtils; @@ -34,6 +35,8 @@ public class ReportServiceImpl implements ReportService { private ReportMapper reportMapper; @Autowired private NwaUserService nwaUserService; + @Autowired + private DataFieldListService dataFieldListService; /** * 接口日志表 @@ -145,4 +148,19 @@ public class ReportServiceImpl implements ReportService { public List> findInspectionTask(Map paramMap) { return reportMapper.findInspectionTask(paramMap); } + + /** + * 查询质检问题统计表 + * @param paramMap + * @return + */ + @Override + public List> findQualityInspectionReport(Map paramMap) { + String site = CommonMethods.getSite(); + paramMap.put("site",site); + paramMap.put("locale",LocaleContextHolder.getLocale().getLanguage()); + List> qualityInspectionReport = reportMapper.findQualityInspectionReport(paramMap); + + return null; + } } diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 119d2999..d321f376 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -199,4 +199,70 @@ AND ZT.MODIFIED_DATE_TIME <= TO_DATE(#{startToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS') + + \ No newline at end of file From 7cacc17a7f446a08259b82a9cbfb14798e3eb627 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Fri, 3 Sep 2021 18:00:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=90=8E=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=B8=93=E6=A3=80=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SplitSfcServiceImpl.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java index 40abd7e1..53fa66cf 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java @@ -3,9 +3,11 @@ package com.foreverwin.mesnac.production.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.dto.SfcDispatchDto; import com.foreverwin.mesnac.common.enums.DispatchStatusEnum; import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.service.InspectionTaskService; import com.foreverwin.mesnac.common.service.SfcDispatchCommonService; import com.foreverwin.mesnac.common.util.ExceptionUtil; import com.foreverwin.mesnac.common.util.StringUtil; @@ -15,7 +17,6 @@ import com.foreverwin.mesnac.meapi.model.Router; import com.foreverwin.mesnac.meapi.service.RouterService; import com.foreverwin.mesnac.meapi.service.RouterStepService; import com.foreverwin.mesnac.meapi.service.ShopOrderService; -import com.foreverwin.mesnac.meapi.service.WorkCenterService; import com.foreverwin.mesnac.production.dto.SplitSfcDto; import com.foreverwin.mesnac.production.mapper.SfcCrossMapper; import com.foreverwin.mesnac.production.mapper.SplitSfcMapper; @@ -36,9 +37,8 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; +import java.util.*; + /** *

* 产品条码拆分表 服务实现类 @@ -57,7 +57,7 @@ public class SplitSfcServiceImpl extends ServiceImpl i @Autowired private SfcDispatchCommonService sfcDispatchCommonService; @Autowired - private WorkCenterService workCenterService; + private InspectionTaskService inspectionTaskService; @Autowired private ShopOrderService shopOrderService; @Autowired @@ -260,6 +260,17 @@ public class SplitSfcServiceImpl extends ServiceImpl i throw new BaseException("处置工艺路线没有步骤"); } sfcDispatchCommonService.saveSplitSfcDispatch(site, CommonMethods.getUser(),"R", sfcData.getShopOrder(), sfc, operation, sfcDispatchBySfc.getStepId(),newSfc, maxRevisionRouter.getHandle(), sfcData.getStepSequence()); + //创建专检任务 + Map paramMap=new HashMap<>(); + paramMap.put("CATEGORY", Constants.INSPECTION_TYPE_P); + paramMap.put("SFC",sfc ); + paramMap.put("SHOP_ORDER",sfcDispatchBySfc.getShopOrder()); + paramMap.put("OPERATION",sfcDispatchBySfc.getOperation()); + paramMap.put("STEP_ID",sfcDispatchBySfc.getStepId());; + paramMap.put("WORK_CENTER",sfcDispatchBySfc.getWorkCenter()); + paramMap.put("RESRCE",sfcDispatchBySfc.getResrce()); + paramMap.put("SFC_DISPATCH_DETAIL_BO",sfcDispatchBySfc.getHandle()); + inspectionTaskService.createNewTask(paramMap); } SplitSfc splitSfc=new SplitSfc(); splitSfc.setHandle(HandleEnum.SPLIT_SFC.getHandle(site,newSfc));