订单跟单结果记录

chenhang4442024
1 parent 573715a9
Showing 7 changed files with 210 additions and 11 deletions
src/main/java/com/order/erp/controller/OrderOpinionLonController.java
src/main/java/com/order/erp/domain/OrderOpinionLogEnum.java
src/main/java/com/order/erp/domain/dto/order/OrderOpinionLogDO.java
src/main/java/com/order/erp/mapper/order/OrderOpinionLogMapper.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
+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.service.order.OrderOpinionLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ *
+ * 订单跟单结果记录日志表(OrderOpinionLogDO)表控制层
+ * @Author:ch
+ * @createTime:2024-08-05
+ */
+@Api(tags = "订单跟单结果记录")
+@RestController
+@RequestMapping("/order/erp/opinion/log")
+public class OrderOpinionLonController {
+
+    @Resource
+    private OrderOpinionLogService orderOpinionLogService;
+
+    @PostMapping("/query_by_id")
+    @ApiOperation("查询订单的跟单结果记录")
+    @AnonymousAccess
+    public ServerResult queryById(OrderOpinionLogDO orderOpinionLogDO){
+       return  orderOpinionLogService.queryById(orderOpinionLogDO);
+    }
+
+}
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author:ch
+ * @createTime:2024-08-05
+ */
+
+@Getter
+@AllArgsConstructor
+public enum OrderOpinionLogEnum {
+  ORDER_PRODUCTION_COMMENT("productionComment","产品意见"),
+  ORDER_PP_CONFIRRM_RESULT("ppConfirmResult","pp样品确认意见"),
+  ORDER_SHIPMENT_SAMPLE_CONFIRM_RESULT("shippmentSampleConfirmResult","shipment sample确认意见"),
+  ORDER_AITEX_TEST_FINISH_RESULT("aitexTestResult","Altex测试结果"),
+  ORDER_SGS_TEST_FINISH_RESULT("sgsTestFinishResult","SGS测试结果"),
+    ;
+    private String type;
+
+    private String desc;
+}
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * @Author:ch
+ * @createTime:2024-08-05
+ * @Description:订单跟单结果记录日志表。
+ */
+
+@TableName("order_opinion_log")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderOpinionLogDO extends BaseDO implements Serializable {
+    private Long id;
+
+    /**
+     * 订单id
+     */
+     private long orderId;
+    /**
+     * 意见类型(SGS/Aitex/SHIPPMENT/PP/产品意见)
+     */
+    private String opinionType;
+
+    /**
+     * 更新字段
+     */
+    private String field;
+}
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.OrderOpinionLogDO;
+
+public interface OrderOpinionLogMapper extends BaseMapper<OrderOpinionLogDO> {
+}
+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;
+
+public interface OrderOpinionLogService extends IService<OrderOpinionLogDO> {
+
+    ServerResult queryById(OrderOpinionLogDO orderOpinionLogDO);
+}
@@ -19,10 +19,7 @@ import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.excel4j.exceptions.Excel4JException;
 import com.order.erp.common.exception.BusinessException;
-import com.order.erp.common.utils.DateUtils;
-import com.order.erp.common.utils.FileUtil;
-import com.order.erp.common.utils.OrderFieldUtils;
-import com.order.erp.common.utils.ProfitUtils;
+import com.order.erp.common.utils.*;
 import com.order.erp.config.DataScope;
 import com.order.erp.domain.*;
 import com.order.erp.domain.dto.BaseDO;
@@ -34,6 +31,7 @@ import com.order.erp.mapper.order.OrderBaseInfoMapper;
 import com.order.erp.service.SystemSettingService;
 import com.order.erp.service.admin.AdminUserService;
 import com.order.erp.service.order.*;
+import freemarker.template.TemplateException;
 import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;
@@ -42,6 +40,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
+import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
@@ -68,7 +67,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Value("${file.host}")
     private String host;
-
+    @Resource
+    private OrderBaseInfoService baseInfoService;
     @Resource
     private OrderProfitAnalysisService profitAnalysisService;
@@ -111,6 +111,12 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Resource
     private SystemSettingService systemSettingService;
+    @Resource
+    private EmailSendUtils emailSendUtils;
+
+    @Resource
+    private OrderOpinionLogService orderOpinionLogService;
+
     /**
      * 通过ID查询单条数据
      * <p>
@@ -1465,7 +1471,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         orderOptLogService.save(buildOrderOptLogDo(baseInfoDO.getId(), userId, OrderOptTypeEnum.ORDER_CREATE.getDesc(), null));
-
+        orderOpinionLogService.save(buildOrderOpinionLogDo(baseInfoDO.getId(),
+                OrderOpinionLogEnum.ORDER_PRODUCTION_COMMENT.getDesc(),
+                orderAddVO.getBaseInfo().getProductionComment()));
         return ServerResult.success();
     }
@@ -1480,6 +1488,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         return OrderOptLogDO.builder().orderId(orderId).userId(userId).fields(jsonString).optType(optType).build();
     }
+    private OrderOpinionLogDO buildOrderOpinionLogDo(Long orderId, String type, String field) {
+        return OrderOpinionLogDO.builder().orderId(orderId).opinionType(type).field(field).build();
+    }
+
     /**
      * @param updateVO
      */
@@ -1570,11 +1582,17 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             throw new BusinessException(ServerResultCode.ORDER_BASE_INFO_EMPTY);
         }
         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);
+            }
+
         }
         if (Objects.nonNull(updateVO.getProfitAnalysisInfo())) {
             checkApply(updateVO.getOrderId(), userId, ApplyTypeEnum.ORDER_PROFIT_APPLY);
@@ -1607,6 +1625,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 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);
+                    }
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getEsoSampleSendTime())) {
                     trackStageDO.setEsoSampleSendTime(trackStageInfo.getEsoSampleSendTime());
@@ -1616,6 +1638,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 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());
+                        orderOpinionLogDOList.add(orderOpinionLogDO);
+                    }
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSelfTestPassTime())) {
                     trackStageDO.setSelfTestPassTime(trackStageInfo.getSelfTestPassTime());
@@ -1625,12 +1651,20 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishResult())) {
                     trackStageDO.setAitexTestFinishResult(trackStageInfo.getAitexTestFinishResult());
+                    if(!(trackStageInfo.getAitexTestFinishResult().equals(trackStageDO.getAitexTestFinishResult()))){
+                        OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getAitexTestFinishResult());
+                        orderOpinionLogDOList.add(orderOpinionLogDO);
+                    }
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSgsTestSendTime())) {
                     trackStageDO.setSgsTestSendTime(trackStageInfo.getSgsTestSendTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishResult())) {
                     trackStageDO.setSgsTestFinishResult(trackStageInfo.getSgsTestFinishResult());
+                    if(!(trackStageInfo.getSgsTestFinishResult().equals(trackStageDO.getSgsTestFinishResult()))){
+                        OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getSgsTestFinishResult());
+                        orderOpinionLogDOList.add(orderOpinionLogDO);
+                    }
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getBarcodeStickerArrivalTime())) {
                     trackStageDO.setBarcodeStickerArrivalTime(trackStageInfo.getBarcodeStickerArrivalTime());
@@ -1641,16 +1675,16 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 if (StringUtils.isNotBlank(trackStageInfo.getLatestBkTime())) {
                     trackStageDO.setLatestBkTime(trackStageInfo.getLatestBkTime());
                 }
-                if((StringUtils.isNotBlank(trackStageInfo.getPpConfirmTime()))){
+                if ((StringUtils.isNotBlank(trackStageInfo.getPpConfirmTime()))) {
                     trackStageDO.setPpConfirmTime(trackStageInfo.getPpConfirmTime());
                 }
-                if((StringUtils.isNotBlank(trackStageInfo.getShippmentSampleConfirmTime()))){
+                if ((StringUtils.isNotBlank(trackStageInfo.getShippmentSampleConfirmTime()))) {
                     trackStageDO.setShippmentSampleConfirmTime(trackStageInfo.getShippmentSampleConfirmTime());
                 }
-                if((StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishTime()))){
+                if ((StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishTime()))) {
                     trackStageDO.setAitexTestFinishTime(trackStageInfo.getAitexTestFinishTime());
                 }
-                if((StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishTime()))){
+                if ((StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishTime()))) {
                     trackStageDO.setSgsTestFinishTime(trackStageInfo.getSgsTestFinishTime());
                 }
                 trackStageDO.setOrderId(updateVO.getOrderId());
@@ -1713,6 +1747,19 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 inspectionStageDO.setOrderId(updateVO.getOrderId());
                 inspectionStageDO.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());
                 inspectionStageService.updateById(inspectionStageDO);
+                OrderBaseInfoDO orderBaseInfoDO = baseInfoService.getById(updateVO.getOrderId());
+                AdminUserDO ProductionDepartmentUserDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
+                OrderEventJobVO orderEventJobVO = new OrderEventJobVO();
+                orderEventJobVO.setInspectionStageInfo(inspectionStageInfo);
+                //一旦修改完质检信息就自动发送邮件对应的生产科。多次编辑保存多次发送。
+                if (StringUtils.isNotBlank(inspectionStageInfo.getEndCheckApplyTime())) {
+                    //尾期验货报告。
+                    emailSendUtils.sendEmail(EmailTemplateEnum.END_CHECK_REPORT_TEMPLATE, ProductionDepartmentUserDO.getEmail(), orderEventJobVO);
+                }
+                //中期验货报告。
+                emailSendUtils.sendEmail(EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE, ProductionDepartmentUserDO.getEmail(), orderEventJobVO);
             } else {
                 inspectionStageDO = new OrderInspectionStageDO();
                 BeanUtils.copyProperties(updateVO.getInspectionStageInfo(), inspectionStageDO);
@@ -1726,6 +1773,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         updateById(orderBaseInfoDo);
         orderOptLogService.save(optLogDO);
+        orderOpinionLogService.saveBatch(orderOpinionLogDOList);
         return ServerResult.success();
     }
@@ -1986,7 +2034,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Override
     public List<OrderBaseInfoDO> getEventList() {
-       List<OrderBaseInfoDO> orderBaseInfoDOList= baseMapper.getEventList();
+        List<OrderBaseInfoDO> orderBaseInfoDOList = baseMapper.getEventList();
         return orderBaseInfoDOList;
     }
 }
+package com.order.erp.service.order.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.mapper.order.OrderOpinionLogMapper;
+import com.order.erp.service.order.OrderOpinionLogService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+
+/**
+ * @Author:ch
+ * @createTime:2024-08-05
+ */
+@Slf4j
+@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 不能为空");
+        }
+        List<OrderOpinionLogDO> orderOpinionLogDOList = list(new LambdaQueryWrapper<OrderOpinionLogDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderOpinionLogDO::getOrderId, orderOpinionLogDO.getOrderId())
+                .orderByDesc(OrderOpinionLogDO::getId));
+        return ServerResult.success(orderOpinionLogDOList);
+    }
+}