canrd-outside / order-erp · Commits

Commit c73377abd374a73526fbbdb07c0d052935de218e

Authored by chwork
2 parents bbb79827 2dff447b
build: skipped

Merge branch 'fix-main-ch' into 'main' 

不在根据中期申请时间和尾期申请时间判断是否发送邮件,根据中期结果和尾期结果判断。



See merge request !10
Inline Side-by-side
Showing 1 changed file with 14 additions and 8 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @c73377a
... ... @@ -1705,7 +1705,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1705 1705 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
1706 1706 .eq(OrderInspectionStageDO::getOrderId, updateVO.getOrderId()));
1707 1707 OrderInspectionStageVO inspectionStageInfo = updateVO.getInspectionStageInfo();
  1708 + String midCheckResult=inspectionStageInfo.getMidCheckResult();
  1709 + String endCheckResult=inspectionStageInfo.getEndCheckResult();
1708 1710 if (Objects.nonNull(inspectionStageDO)) {
  1711 + midCheckResult=inspectionStageDO.getMidCheckResult();
  1712 + endCheckResult=inspectionStageDO.getEndCheckResult();
1709 1713 if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())) {
1710 1714 inspectionStageDO.setMidCheckApplyTime(inspectionStageInfo.getMidCheckApplyTime());
1711 1715 }
... ... @@ -1750,7 +1754,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1750 1754 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
1751 1755 .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
1752 1756 if( Objects.nonNull(ProductionDepartmentUserDO) && StringUtils.isNotBlank(ProductionDepartmentUserDO.getEmail())){
1753   - sendOrderInspectionStage(updateVO,inspectionStageInfo);
  1757 + sendOrderInspectionStage(updateVO,midCheckResult,endCheckResult);
1754 1758 }
1755 1759 } else {
1756 1760 inspectionStageDO = new OrderInspectionStageDO();
... ... @@ -1763,7 +1767,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1763 1767 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
1764 1768 .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
1765 1769 if( Objects.nonNull(ProductionDepartmentUserDO) && StringUtils.isNotBlank(ProductionDepartmentUserDO.getEmail())){
1766   - sendOrderInspectionStage(updateVO,inspectionStageInfo);
  1770 + midCheckResult="1";
  1771 + endCheckResult="1";
  1772 + sendOrderInspectionStage(updateVO,midCheckResult,endCheckResult);
1767 1773 }
1768 1774  
1769 1775 }
... ... @@ -2047,28 +2053,28 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
2047 2053 return orderBaseInfoDOList;
2048 2054 }
2049 2055  
2050   - private void sendOrderInspectionStage(OrderUpdateVO updateVO, OrderInspectionStageVO inspectionStageInfo){
  2056 + private void sendOrderInspectionStage(OrderUpdateVO updateVO,String midCheckResult,String endCheckResult){
2051 2057 OrderBaseInfoDO orderBaseInfoDO = baseInfoService.getById(updateVO.getOrderId());
2052 2058 AdminUserDO ProductionDepartmentUserDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
2053 2059 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
2054 2060 .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
2055 2061 OrderEventJobVO orderEventJobVO = new OrderEventJobVO();
2056   - orderEventJobVO.setInspectionStageInfo(inspectionStageInfo);
  2062 + orderEventJobVO.setInspectionStageInfo(updateVO.getInspectionStageInfo());
2057 2063 OrderBaseInfoVO orderBaseInfoVo = BeanUtil.copyProperties(orderBaseInfoDO, OrderBaseInfoVO.class);
2058 2064 orderEventJobVO.setBaseInfo(orderBaseInfoVo);
2059 2065 List<String> emails = Arrays.asList(ProductionDepartmentUserDO.getEmail().split( "[,，]+"))
2060 2066 .stream().map(String::trim)
2061 2067 .collect(Collectors.toList());
2062 2068 //一旦修改完质检信息就自动发送邮件对应的生产科。多次编辑保存多次发送。
2063   - if (StringUtils.isNotBlank(inspectionStageInfo.getEndCheckApplyTime())) {
2064   - String EndCheckApplyTime= inspectionStageInfo.getEndCheckApplyTime().substring(0, 10);
  2069 + if (StringUtils.isNotBlank(updateVO.getInspectionStageInfo().getEndCheckResult()) && !(updateVO.getInspectionStageInfo().getEndCheckResult().equals(endCheckResult))) {
  2070 + String EndCheckApplyTime= updateVO.getInspectionStageInfo().getEndCheckApplyTime().substring(0, 10);
2065 2071 String ProductionDepartmentConsignTime =orderBaseInfoDO.getProductionDepartmentConsignTime().substring(0, 10);
2066 2072 orderEventJobVO.getInspectionStageInfo().setEndCheckApplyTime(EndCheckApplyTime);
2067 2073 orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(ProductionDepartmentConsignTime);
2068 2074 //尾期验货报告。
2069 2075 emailSendUtils.sendEmail(EmailTemplateEnum.END_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
2070   - }else if(StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())){
2071   - String MidCheckApplyTime= inspectionStageInfo.getMidCheckApplyTime().substring(0, 10);
  2076 + }else if(StringUtils.isNotBlank(updateVO.getInspectionStageInfo().getMidCheckResult()) && !(updateVO.getInspectionStageInfo().getMidCheckResult().equals(midCheckResult))){
  2077 + String MidCheckApplyTime= updateVO.getInspectionStageInfo().getMidCheckApplyTime().substring(0, 10);
2072 2078 String ProductionDepartmentConsignTime =orderBaseInfoDO.getProductionDepartmentConsignTime().substring(0, 10);
2073 2079 String MidCheckApply = DateUtils.format(DateUtils.parseDate(MidCheckApplyTime, DATE), DATE);
2074 2080 String ProductionDepartmentConsign = DateUtils.format(DateUtils.parseDate(ProductionDepartmentConsignTime,DATE), DATE);
... ...