fix:1.给应收款和应付款从单个状态设置改为勾选批量状态设置。

2.改为由前端来控制,当填写时间大于Hod时间则对质检信息无法编辑。

fix:1.给应收款和应付款从单个状态设置改为勾选批量状态设置。
2.改为由前端来控制,当填写时间大于Hod时间则对质检信息无法编辑。
chenhang4442024
1 parent 360aae57
Showing 7 changed files with 52 additions and 64 deletions
src/main/java/com/order/erp/domain/vo/order/InvoiceBillDeductInfoVO.java
src/main/java/com/order/erp/domain/vo/order/ProducePaymentCheckBillInvoiceInfoVO.java
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProducePaymentCheckBillOrderServiceImpl.java
src/main/resources/application-pre-prod.yml
src/main/resources/application-test.yml
@@ -5,6 +5,7 @@ import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 /**
  * 应收款账单 -- 扣款信息
@@ -22,6 +23,8 @@ public class InvoiceBillDeductInfoVO implements Serializable {
     private Long id;
+    private List<Long> ids;
+
     /**
      * 发票单号
      */
@@ -4,6 +4,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.util.List;
 /**
  * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
@@ -21,6 +22,8 @@ public class ProducePaymentCheckBillInvoiceInfoVO implements Serializable {
     private Long id;
+    private List<Long> ids;
+
     /**
      * 发票url地址
      */
@@ -1715,36 +1715,30 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
     @Override
     public ServerResult isFinishStatus(InvoiceBillDeductInfoVO invoiceBillDeductInfoVO) {
-        if(Objects.isNull(invoiceBillDeductInfoVO.getId())){
+        if(CollectionUtils.isEmpty(invoiceBillDeductInfoVO.getIds())){
             throw  new BusinessException(ServerResultCode.PARAM_ERROR);
         }
-        InvoiceBillOrderDO invoiceBillOrderDO = getById(invoiceBillDeductInfoVO.getId());
-        if(Objects.nonNull(invoiceBillOrderDO)){
-            if((!FinanceEnum.RECEIVED_PAYMENT.getStatus().equals(invoiceBillOrderDO.getStatus())) && (!FinanceEnum.OK_PAYMENT.getStatus().equals(invoiceBillOrderDO.getStatus()))){
-                throw new BusinessException("该订单还没有审核通过,你无法设置最终状态为已收款!");
-            }
-            List<InvoiceBillOrderDO> invoiceBillOrderDOList = list(new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .eq(InvoiceBillOrderDO::getInvoiceNo, invoiceBillOrderDO.getInvoiceNo())
-                    //这里没问题的,只会去对已通过审核的invoiceNO进行查询,即使invoiceNo相同,但是它没有通过审核也不会被修改为已手动审核通过的状态。
-                    .eq(InvoiceBillOrderDO::getStatus, FinanceEnum.RECEIVED_PAYMENT.getStatus()));
-            if(CollectionUtils.isNotEmpty(invoiceBillOrderDOList)){
-                List<InvoiceBillOrderDO> finishSatusList = invoiceBillOrderDOList.stream().map(x -> {
-                    x.setStatus(FinanceEnum.OK_PAYMENT.getStatus());
-                    return x;
-                }).collect(Collectors.toList());
-                //还需要把基础订单的状态也改一下。
-                List<Long> orderIds = invoiceBillOrderDOList.stream().map(InvoiceBillOrderDO::getOrderId).collect(Collectors.toList());
-                List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
-                List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().map(order -> {
-                    order.setInvoiceStatus(FinanceEnum.OK_PAYMENT.getStatus());
-                    return order;
-                }).collect(Collectors.toList());
-                transactionHelper.run(() ->{
-                    updateBatchById(finishSatusList);
-                    orderBaseInfoService.updateBatchById(orderBaseInfoDOS);
-                });
+        List<InvoiceBillOrderDO> invoiceBillOrderDOS = list(new LambdaQueryWrapper<InvoiceBillOrderDO>()
+                .eq(InvoiceBillOrderDO::getStatus, FinanceEnum.RECEIVED_PAYMENT.getStatus())
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(InvoiceBillOrderDO::getId, invoiceBillDeductInfoVO.getIds()));
+        if(CollectionUtils.isNotEmpty(invoiceBillOrderDOS)){
+            List<InvoiceBillOrderDO> finishSatusList = invoiceBillOrderDOS.stream().map(x -> {
+                x.setStatus(FinanceEnum.OK_PAYMENT.getStatus());
+                return x;
+            }).collect(Collectors.toList());
+            //还需要把基础订单的状态也改一下。
+            List<Long> orderIds = invoiceBillOrderDOS.stream().map(InvoiceBillOrderDO::getOrderId).collect(Collectors.toList());
+            List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
+            List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().map(order -> {
+                order.setInvoiceStatus(FinanceEnum.OK_PAYMENT.getStatus());
+                return order;
+            }).collect(Collectors.toList());
+            transactionHelper.run(() ->{
+                updateBatchById(finishSatusList);
+                orderBaseInfoService.updateBatchById(orderBaseInfoDOS);
+            });
-            }
         }
         return ServerResult.success();
     }
@@ -2187,14 +2187,6 @@ end
                     .eq(OrderInspectionStageDO::getOrderId, updateVO.getOrderId())
                     .last("limit 1"));
-            //对于质检信息,如果填写时间查超过订单的尾期拖货时间并且你的尾期结果不为FAIL,那么你就无法填写,说明你在补数据,而不是实时填写。--start
-            String dateStr = orderBaseInfoDo.getProductionDepartmentConsignTime().substring(0, 10);
-            LocalDate productionDepartmentConsignTime = LocalDate.parse(dateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-            if(currentDate.isAfter(productionDepartmentConsignTime) && StringUtils.isBlank(inspectionStageDO.getEndCheckResult())){
-                throw new BusinessException("已经过了"+dateStr+"拖货时间,禁止填写质检信息");
-            }
-            //上面这段代码始终不行,还是需要前端控制是否填写。不然一直填写不上。因为你不能像前端那样申请字段解锁逻辑,到时候由前端来控制实际否能够填写尾期验货结果,就需要删除这段代码。 -end
-
             String midCheckResult = inspectionStageInfo.getMidCheckResult();
             String endCheckResult = inspectionStageInfo.getEndCheckResult();
             if (Objects.nonNull(inspectionStageDO)) {
@@ -1454,33 +1454,29 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
     @Override
     public ServerResult isFinishStatus(ProducePaymentCheckBillInvoiceInfoVO producePaymentCheckBillInvoiceInfoVO) {
-        if(Objects.isNull(producePaymentCheckBillInvoiceInfoVO.getId())){
+        if(CollectionUtils.isEmpty(producePaymentCheckBillInvoiceInfoVO.getIds())){
             throw new BusinessException(ServerResultCode.PARAM_ERROR);
         }
-        ProducePaymentCheckBillOrderDO producePaymentCheckBillOrderDO = getById(producePaymentCheckBillInvoiceInfoVO.getId());
-        if(Objects.nonNull(producePaymentCheckBillOrderDO)){
-            if((!FinanceEnum.RECEIVED_PAYMENT.getStatus().equals(producePaymentCheckBillOrderDO.getStatus())) && (!FinanceEnum.OK_PAYMENT.getStatus().equals(producePaymentCheckBillOrderDO.getStatus()))){
-                throw new BusinessException("该订单还没有审核通过,你无法设置最终状态为已付款!");
-            }
-            List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOList = list(new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .eq(ProducePaymentCheckBillOrderDO::getStatus, FinanceEnum.RECEIVED_PAYMENT.getStatus())
-                    .eq(ProducePaymentCheckBillOrderDO::getCheckNo, producePaymentCheckBillOrderDO.getCheckNo()));
-            if(CollectionUtils.isNotEmpty(producePaymentCheckBillOrderDOList)){
-                List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOS = producePaymentCheckBillOrderDOList.stream().map(x -> {
-                    x.setStatus(FinanceEnum.OK_PAYMENT.getStatus());
-                    return x;
-                }).collect(Collectors.toList());
-                List<Long> orderIds = producePaymentCheckBillOrderDOList.stream().map(ProducePaymentCheckBillOrderDO::getOrderId).collect(Collectors.toList());
-                List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
-                List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().map(order -> {
-                    order.setCheckStatus(FinanceEnum.OK_PAYMENT.getStatus());
-                    return order;
-                }).collect(Collectors.toList());
-                transactionHelper.run(() ->{
-                    updateBatchById(producePaymentCheckBillOrderDOS);
-                    orderBaseInfoService.updateBatchById(orderBaseInfoDOS);
-                });
-            }
+        List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOList = list(new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>()
+                .eq(ProducePaymentCheckBillOrderDO::getStatus, FinanceEnum.RECEIVED_PAYMENT.getStatus())
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(ProducePaymentCheckBillOrderDO::getId,producePaymentCheckBillInvoiceInfoVO.getIds()));
+        if(CollectionUtils.isNotEmpty(producePaymentCheckBillOrderDOList)){
+            List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOS = producePaymentCheckBillOrderDOList.stream().map(x -> {
+                x.setStatus(FinanceEnum.OK_PAYMENT.getStatus());
+                return x;
+            }).collect(Collectors.toList());
+
+        List<Long> orderIds = producePaymentCheckBillOrderDOS.stream().map(ProducePaymentCheckBillOrderDO::getOrderId).collect(Collectors.toList());
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
+        List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().map(order -> {
+              order.setCheckStatus(FinanceEnum.OK_PAYMENT.getStatus());
+                 return order;
+             }).collect(Collectors.toList());
+        transactionHelper.run(() ->{
+            updateBatchById(producePaymentCheckBillOrderDOS);
+            orderBaseInfoService.updateBatchById(orderBaseInfoDOS);
+            });
         }
         return ServerResult.success();
     }
@@ -59,7 +59,7 @@ spring:
     testOnReturn: true
     password: eJ8(bD6]wN6=gI5=
     time-between-eviction-runs-millis: 1000
-    url: jdbc:mysql://47.104.8.35:3307/order-erp-pre-prod?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
+    url: jdbc:mysql://47.104.8.35:3307/order-erp-prod?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
     username: root
   redis:
     database: 10
@@ -80,7 +80,7 @@ spring:
     host: smtp.163.com
     # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
     #    username: information@alterego.xin
-    username: chenhang4442024@163.com
+    username: c1henhang4442024@163.com
     # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
     #    password: AlterEgo1608ITf31
     password: WGdg9Fx4za53FXvj
@@ -59,7 +59,7 @@ spring:
     testOnReturn: true
     password: eJ8(bD6]wN6=gI5=
     time-between-eviction-runs-millis: 1000
-    url: jdbc:mysql://47.104.8.35:3307/order-erp?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
+    url: jdbc:mysql://47.104.8.35:3307/order-erp-test?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
     username: root
   redis:
     database: 0
@@ -79,7 +79,7 @@ spring:
     #    host: smtp.mxhichina.com
     host: smtp.163.com
     # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
-    username: chenhang4442024@163.com
+    username: c1henhang4442024@163.com
     # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
     password: WGdg9Fx4za53FXvj
     # 邮件接收者