跟单记录信息和生产科邮件配置

chenhang4442024
1 parent bfb51ca5
Showing 9 changed files with 89 additions and 32 deletions
src/main/java/com/order/erp/controller/OrderOpinionLonController.java
src/main/java/com/order/erp/domain/dto/order/OrderOpinionLogDO.java
src/main/java/com/order/erp/domain/dto/order/OrderTrackStageDO.java
src/main/java/com/order/erp/domain/vo/order/OrderOpinionLogVO.java
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
src/main/java/com/order/erp/service/order/OrderBaseInfoService.java
src/main/java/com/order/erp/service/order/OrderOpinionLogService.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderOpinionLogServiceImpl.java
@@ -3,10 +3,13 @@ package com.order.erp.controller;
 import com.order.erp.common.annotation.AnonymousAccess;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.dto.order.OrderOpinionLogDO;
+import com.order.erp.domain.vo.order.OrderOpinionLogVO;
 import com.order.erp.service.order.OrderOpinionLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -29,8 +32,8 @@ public class OrderOpinionLonController {
     @PostMapping("/query_by_id")
     @ApiOperation("查询订单的跟单结果记录")
     @AnonymousAccess
-    public ServerResult queryById(OrderOpinionLogDO orderOpinionLogDO){
-       return  orderOpinionLogService.queryById(orderOpinionLogDO);
+    public ServerResult queryById(@RequestBody @Validated OrderOpinionLogVO orderOpinionLogVo){
+       return  orderOpinionLogService.queryById(orderOpinionLogVo);
     }
 }
@@ -5,6 +5,7 @@ import com.order.erp.domain.dto.BaseDO;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 /**
@@ -26,7 +27,7 @@ public class OrderOpinionLogDO extends BaseDO implements Serializable {
     /**
      * 订单id
      */
-     private long orderId;
+     private Long orderId;
     /**
      * 意见类型(SGS/Aitex/SHIPPMENT/PP/产品意见)
      */
@@ -37,7 +37,7 @@ public class OrderTrackStageDO extends BaseDO implements Serializable {
      * pp样品确认意见
      */
     private String ppConfirmResult;
-    /**tring
+    /**
      * pp样品确认时间
      * */
     private String ppConfirmTime;
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @Author:ch
+ * @createTime:2024-08-07
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderOpinionLogVO {
+    private Long id;
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+    /**
+     * 意见类型(SGS/Aitex/SHIPPMENT/PP/产品意见)
+     */
+    private String opinionType;
+
+    /**
+     * 更新字段
+     */
+    private String field;
+}
@@ -187,6 +187,9 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
             throw new BusinessException("手机号已被注册");
         }
         AdminUserDO adminUserDo = BeanUtil.copyProperties(adminUserVO, AdminUserDO.class);
+        if(StringUtils.isNotBlank(adminUserVO.getEmail())){
+            adminUserDo.setEmail(adminUserVO.getEmail());
+        }
         if (StringUtils.isNotBlank(adminUserVO.getUserName())) {
             adminUserDo.setNickName(adminUserVO.getUserName());
         }
@@ -6,7 +6,9 @@ import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.excel4j.exceptions.Excel4JException;
 import com.order.erp.domain.dto.order.OrderBaseInfoDO;
 import com.order.erp.domain.vo.order.*;
+import freemarker.template.TemplateException;
+import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
@@ -89,7 +91,7 @@ public interface OrderBaseInfoService extends IService&lt;OrderBaseInfoDO&gt; {
      * @param updateVO 数据VO
      * @return 编辑结果
      */
-    ServerResult edit(OrderUpdateVO updateVO);
+    ServerResult edit(OrderUpdateVO updateVO) ;
     /**
      * 通过主键删除数据
@@ -3,8 +3,9 @@ package com.order.erp.service.order;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.dto.order.OrderOpinionLogDO;
+import com.order.erp.domain.vo.order.OrderOpinionLogVO;
 public interface OrderOpinionLogService extends IService<OrderOpinionLogDO> {
-    ServerResult queryById(OrderOpinionLogDO orderOpinionLogDO);
+    ServerResult queryById(OrderOpinionLogVO orderOpinionLogVo);
 }
@@ -1471,9 +1471,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         orderOptLogService.save(buildOrderOptLogDo(baseInfoDO.getId(), userId, OrderOptTypeEnum.ORDER_CREATE.getDesc(), null));
-        orderOpinionLogService.save(buildOrderOpinionLogDo(baseInfoDO.getId(),
+        OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(baseInfoDO.getId(),
                 OrderOpinionLogEnum.ORDER_PRODUCTION_COMMENT.getDesc(),
-                orderAddVO.getBaseInfo().getProductionComment()));
+                orderAddVO.getBaseInfo().getProductionComment());
+        orderOpinionLogService.save(orderOpinionLogDO);
         return ServerResult.success();
     }
@@ -1584,15 +1585,14 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         OrderOptLogDO optLogDO = new OrderOptLogDO();
         List<OrderOpinionLogDO> orderOpinionLogDOList = new ArrayList<>();
         if (Objects.nonNull(updateVO.getBaseInfo())) {
-            buildUpdateVO(updateVO.getBaseInfo(), orderBaseInfoDo);
-            orderBaseInfoDo.setId(updateVO.getOrderId());
-            optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_EDIT.getDesc(), JSONObject.toJSONString(updateVO));
-            clearLockedField(updateVO.getOrderId(), userId, LockedFieldTypeEnum.ORDER_BASE);
             if(!(updateVO.getBaseInfo().getProductionComment().equals(orderBaseInfoDo.getProductionComment()))){
                 OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_PRODUCTION_COMMENT.getDesc(),updateVO.getBaseInfo().getProductionComment());
                 orderOpinionLogDOList.add(orderOpinionLogDO);
             }
-
+            buildUpdateVO(updateVO.getBaseInfo(), orderBaseInfoDo);
+            orderBaseInfoDo.setId(updateVO.getOrderId());
+            optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_EDIT.getDesc(), JSONObject.toJSONString(updateVO));
+            clearLockedField(updateVO.getOrderId(), userId, LockedFieldTypeEnum.ORDER_BASE);
         }
         if (Objects.nonNull(updateVO.getProfitAnalysisInfo())) {
             checkApply(updateVO.getOrderId(), userId, ApplyTypeEnum.ORDER_PROFIT_APPLY);
@@ -1624,11 +1624,14 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setPpTime(trackStageInfo.getPpTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getPpConfirmResult())) {
-                    trackStageDO.setPpConfirmResult(trackStageInfo.getPpConfirmResult());
-                    if(!(trackStageInfo.getPpConfirmResult().equals(trackStageDO.getPpConfirmResult()))){
-                         OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_PP_CONFIRRM_RESULT.getDesc(),trackStageInfo.getPpConfirmResult());
-                         orderOpinionLogDOList.add(orderOpinionLogDO);
+                    //由于跟单信息在创建时也是采用edit接口,所以要限制第一次创建时ppconfirmResult为空的情况,这种情况不计算到跟单记录中去。
+                    if(!(trackStageInfo.getPpConfirmResult().equals(trackStageDO.getPpConfirmResult())) &&
+                            StringUtils.isNotBlank(trackStageDO.getPpConfirmResult()) ){
+                        //用于在跟单记录中展示。
+                        OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_PP_CONFIRRM_RESULT.getDesc(),trackStageInfo.getPpConfirmResult());
+                        orderOpinionLogDOList.add(orderOpinionLogDO);
                     }
+                    trackStageDO.setPpConfirmResult(trackStageInfo.getPpConfirmResult());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getEsoSampleSendTime())) {
                     trackStageDO.setEsoSampleSendTime(trackStageInfo.getEsoSampleSendTime());
@@ -1637,11 +1640,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setShippmentSampleSendTime(trackStageInfo.getShippmentSampleSendTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getShippmentSampleConfirmResult())) {
-                    trackStageDO.setShippmentSampleConfirmResult(trackStageInfo.getShippmentSampleConfirmResult());
-                    if(!(trackStageInfo.getShippmentSampleConfirmResult().equals(trackStageDO.getShippmentSampleConfirmResult()))){
-                        OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_SHIPMENT_SAMPLE_CONFIRM_RESULT.getDesc(),trackStageInfo.getShippmentSampleConfirmResult());
+                    if(!(trackStageInfo.getShippmentSampleConfirmResult().equals(trackStageDO.getShippmentSampleConfirmResult())) &&
+                            StringUtils.isNotBlank(trackStageDO.getShippmentSampleConfirmResult())) {
+                        OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(), OrderOpinionLogEnum.ORDER_SHIPMENT_SAMPLE_CONFIRM_RESULT.getDesc(), trackStageInfo.getShippmentSampleConfirmResult());
                         orderOpinionLogDOList.add(orderOpinionLogDO);
-                    }
+                    }trackStageDO.setShippmentSampleConfirmResult(trackStageInfo.getShippmentSampleConfirmResult());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSelfTestPassTime())) {
                     trackStageDO.setSelfTestPassTime(trackStageInfo.getSelfTestPassTime());
@@ -1650,21 +1653,23 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setAitexTestSendTime(trackStageInfo.getAitexTestSendTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishResult())) {
-                    trackStageDO.setAitexTestFinishResult(trackStageInfo.getAitexTestFinishResult());
-                    if(!(trackStageInfo.getAitexTestFinishResult().equals(trackStageDO.getAitexTestFinishResult()))){
+                    if(!(trackStageInfo.getAitexTestFinishResult().equals(trackStageDO.getAitexTestFinishResult())) &&
+                            StringUtils.isNotBlank(trackStageDO.getAitexTestFinishResult())){
                         OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getAitexTestFinishResult());
                         orderOpinionLogDOList.add(orderOpinionLogDO);
                     }
+                    trackStageDO.setAitexTestFinishResult(trackStageInfo.getAitexTestFinishResult());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSgsTestSendTime())) {
                     trackStageDO.setSgsTestSendTime(trackStageInfo.getSgsTestSendTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishResult())) {
-                    trackStageDO.setSgsTestFinishResult(trackStageInfo.getSgsTestFinishResult());
-                    if(!(trackStageInfo.getSgsTestFinishResult().equals(trackStageDO.getSgsTestFinishResult()))){
+                    if(!(trackStageInfo.getSgsTestFinishResult().equals(trackStageDO.getSgsTestFinishResult())) &&
+                            StringUtils.isNotBlank(trackStageDO.getSgsTestFinishResult())){
                         OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getSgsTestFinishResult());
                         orderOpinionLogDOList.add(orderOpinionLogDO);
                     }
+                    trackStageDO.setSgsTestFinishResult(trackStageInfo.getSgsTestFinishResult());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getBarcodeStickerArrivalTime())) {
                     trackStageDO.setBarcodeStickerArrivalTime(trackStageInfo.getBarcodeStickerArrivalTime());
@@ -1753,13 +1758,20 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                         .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
                 OrderEventJobVO orderEventJobVO = new OrderEventJobVO();
                 orderEventJobVO.setInspectionStageInfo(inspectionStageInfo);
+                OrderBaseInfoVO orderBaseInfoVo = BeanUtil.copyProperties(orderBaseInfoDo, OrderBaseInfoVO.class);
+                orderEventJobVO.setBaseInfo(orderBaseInfoVo);
+                List<String> emails = Arrays.asList(ProductionDepartmentUserDO.getEmail().split( "[,，]+"))
+                        .stream().map(String::trim)
+                        .collect(Collectors.toList());
                 //一旦修改完质检信息就自动发送邮件对应的生产科。多次编辑保存多次发送。
                 if (StringUtils.isNotBlank(inspectionStageInfo.getEndCheckApplyTime())) {
                     //尾期验货报告。
-                    emailSendUtils.sendEmail(EmailTemplateEnum.END_CHECK_REPORT_TEMPLATE, ProductionDepartmentUserDO.getEmail(), orderEventJobVO);
+                    emailSendUtils.sendEmail(EmailTemplateEnum.END_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
+                }else if(StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())){
+                    //中期验货报告。
+                    emailSendUtils.sendEmail(EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
                 }
-                //中期验货报告。
-                emailSendUtils.sendEmail(EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE, ProductionDepartmentUserDO.getEmail(), orderEventJobVO);
+
             } else {
                 inspectionStageDO = new OrderInspectionStageDO();
                 BeanUtils.copyProperties(updateVO.getInspectionStageInfo(), inspectionStageDO);
@@ -6,6 +6,7 @@ import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.order.OrderOpinionLogDO;
+import com.order.erp.domain.vo.order.OrderOpinionLogVO;
 import com.order.erp.mapper.order.OrderOpinionLogMapper;
 import com.order.erp.service.order.OrderOpinionLogService;
 import lombok.extern.slf4j.Slf4j;
@@ -23,13 +24,15 @@ import java.util.Objects;
 @Service
 public class OrderOpinionLogServiceImpl extends ServiceImpl<OrderOpinionLogMapper, OrderOpinionLogDO> implements OrderOpinionLogService {
     @Override
-    public ServerResult queryById(OrderOpinionLogDO orderOpinionLogDO) {
-        if (Objects.isNull(orderOpinionLogDO.getId())) {
-            return ServerResult.fail("id 不能为空");
+    public ServerResult queryById(OrderOpinionLogVO orderOpinionLogVo) {
+        log.info("orderId"+orderOpinionLogVo.getOrderId());
+        System.out.println(orderOpinionLogVo);
+        if (Objects.isNull(orderOpinionLogVo.getOrderId())) {
+            return ServerResult.fail("OrderId 不能为空");
         }
         List<OrderOpinionLogDO> orderOpinionLogDOList = list(new LambdaQueryWrapper<OrderOpinionLogDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(OrderOpinionLogDO::getOrderId, orderOpinionLogDO.getOrderId())
+                .eq(OrderOpinionLogDO::getOrderId, orderOpinionLogVo.getOrderId())
                 .orderByDesc(OrderOpinionLogDO::getId));
         return ServerResult.success(orderOpinionLogDOList);
     }