feat: ERP升级

1、fix 冲突

feat: ERP升级
1、fix 冲突
谢茂盛
1 parent 07ba3676
Showing 1 changed file with 75 additions and 2 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -259,6 +259,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 // 填充质检信息
                 fillInspectionStageInfo(resultVOList);
             }
+
             if (CollectionUtils.isNotEmpty(resultVOList)) {
                 List<Map<String, Object>> list = buildExportMapVOS(resultVOList, lockFieldVO);
                 if (CollectionUtils.isNotEmpty(list)) {
@@ -1500,7 +1501,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         orderOptLogService.save(buildOrderOptLogDo(baseInfoDO.getId(), userId, OrderOptTypeEnum.ORDER_CREATE.getDesc(), null));
-
+        OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(baseInfoDO.getId(),
+                OrderOpinionLogEnum.ORDER_PRODUCTION_COMMENT.getDesc(),
+                orderAddVO.getBaseInfo().getProductionComment());
+        orderOpinionLogService.save(orderOpinionLogDO);
         return ServerResult.success();
     }
@@ -1515,6 +1519,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
      */
@@ -1605,7 +1613,12 @@ 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())) {
+            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));
@@ -1641,6 +1654,13 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setPpTime(trackStageInfo.getPpTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getPpConfirmResult())) {
+                    //由于跟单信息在创建时也是采用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())) {
@@ -1650,7 +1670,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())) &&
+                            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());
@@ -1659,12 +1683,22 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setAitexTestSendTime(trackStageInfo.getAitexTestSendTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.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())) {
+                    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())) {
@@ -1676,6 +1710,18 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 if (StringUtils.isNotBlank(trackStageInfo.getLatestBkTime())) {
                     trackStageDO.setLatestBkTime(trackStageInfo.getLatestBkTime());
                 }
+                if ((StringUtils.isNotBlank(trackStageInfo.getPpConfirmTime()))) {
+                    trackStageDO.setPpConfirmTime(trackStageInfo.getPpConfirmTime());
+                }
+                if ((StringUtils.isNotBlank(trackStageInfo.getShippmentSampleConfirmTime()))) {
+                    trackStageDO.setShippmentSampleConfirmTime(trackStageInfo.getShippmentSampleConfirmTime());
+                }
+                if ((StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishTime()))) {
+                    trackStageDO.setAitexTestFinishTime(trackStageInfo.getAitexTestFinishTime());
+                }
+                if ((StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishTime()))) {
+                    trackStageDO.setSgsTestFinishTime(trackStageInfo.getSgsTestFinishTime());
+                }
                 trackStageDO.setOrderId(updateVO.getOrderId());
                 trackStageDO.setOrderStatus(OrderStatusEnum.TRACK_ING.getStatus());
                 trackStageService.updateById(trackStageDO);
@@ -1736,6 +1782,26 @@ 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);
+                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, emails, orderEventJobVO);
+                }else if(StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())){
+                    //中期验货报告。
+                    emailSendUtils.sendEmail(EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
+                }
+
             } else {
                 inspectionStageDO = new OrderInspectionStageDO();
                 BeanUtils.copyProperties(updateVO.getInspectionStageInfo(), inspectionStageDO);
@@ -1749,6 +1815,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         updateById(orderBaseInfoDo);
         orderOptLogService.save(optLogDO);
+        orderOpinionLogService.saveBatch(orderOpinionLogDOList);
         return ServerResult.success();
     }
@@ -2006,4 +2073,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         return ServerResult.success();
     }
+
+    @Override
+    public List<OrderBaseInfoDO> getEventList() {
+        List<OrderBaseInfoDO> orderBaseInfoDOList = baseMapper.getEventList();
+        return orderBaseInfoDOList;
+    }
 }