Merge remote-tracking branch 'origin/dev_finance_20240830' into test

# Conflicts: # src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java

Merge remote-tracking branch 'origin/dev_finance_20240830' into test
# Conflicts: # src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
谢茂盛
2 parents 151f61c9 a437906e
Showing 2 changed files with 36 additions and 75 deletions
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoVO.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -22,6 +22,10 @@ public class OrderBaseInfoVO implements Serializable {
     private Long id;
     /**
+     * 发票单号
+     */
+    private String invoiceNo;
+    /**
      * 客户编码
      */
     private String customerCode;
@@ -117,6 +117,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Resource
     private OrderOpinionLogService orderOpinionLogService;
+    @Resource
+    private InvoiceBillMappingService invoiceBillMappingService;
+
     /**
      * 通过ID查询单条数据
      * <p>
@@ -198,6 +201,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             // 填充质检信息
             fillInspectionStageInfo(resultVOList);
+            // 填充发票信息
+            fillInvoiceNo(resultVOList);
+
             if (locked) {
                 // 填充字段锁定信息
                 fillLockFields(resultVOList);
@@ -253,7 +259,6 @@ 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)) {
@@ -834,6 +839,30 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     /**
      * @param orderInfoResultVOList
      */
+    private void fillInvoiceNo(List<OrderInfoResultVO> orderInfoResultVOList) {
+        if (CollectionUtils.isEmpty(orderInfoResultVOList)) {
+            return;
+        }
+
+        Set<Long> orderIds = orderInfoResultVOList.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
+        List<InvoiceBillMappingDO> invoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(InvoiceBillMappingDO::getOrderId, orderIds));
+        if (CollectionUtils.isEmpty(invoiceBillMappingDOS)) {
+            return;
+        }
+        Map<Long, InvoiceBillMappingDO> invoiceBillMappingDOMap = invoiceBillMappingDOS.stream().collect(Collectors.toMap(InvoiceBillMappingDO::getOrderId, Function.identity(), (v1, v2) -> v1));
+        orderInfoResultVOList.forEach(result -> {
+            if (invoiceBillMappingDOMap.containsKey(result.getId())) {
+                InvoiceBillMappingDO invoiceBillMappingDO = invoiceBillMappingDOMap.get(result.getId());
+                result.setInvoiceNo(invoiceBillMappingDO.getInvoiceNo());
+            }
+        });
+    }
+
+    /**
+     * @param orderInfoResultVOList
+     */
     private void fillReportInfo(List<OrderInfoResultVO> orderInfoResultVOList) {
         if (CollectionUtils.isEmpty(orderInfoResultVOList)) {
             return;
@@ -1471,10 +1500,7 @@ 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();
     }
@@ -1489,10 +1515,6 @@ 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
      */
@@ -1583,12 +1605,7 @@ 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));
@@ -1624,13 +1641,6 @@ 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())) {
@@ -1640,11 +1650,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setShippmentSampleSendTime(trackStageInfo.getShippmentSampleSendTime());
                 }
                 if (StringUtils.isNotBlank(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());
+                    trackStageDO.setShippmentSampleConfirmResult(trackStageInfo.getShippmentSampleConfirmResult());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSelfTestPassTime())) {
                     trackStageDO.setSelfTestPassTime(trackStageInfo.getSelfTestPassTime());
@@ -1653,22 +1659,12 @@ 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())) {
@@ -1680,18 +1676,6 @@ 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);
@@ -1752,26 +1736,6 @@ 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);
@@ -1785,7 +1749,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         updateById(orderBaseInfoDo);
         orderOptLogService.save(optLogDO);
-        orderOpinionLogService.saveBatch(orderOpinionLogDOList);
         return ServerResult.success();
     }
@@ -2043,10 +2006,4 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         return ServerResult.success();
     }
-
-    @Override
-    public List<OrderBaseInfoDO> getEventList() {
-        List<OrderBaseInfoDO> orderBaseInfoDOList = baseMapper.getEventList();
-        return orderBaseInfoDOList;
-    }
 }