需求

src/main/java/com/zfire/mall/manager/logic/k3/K3OtherStockInLogic.java

@@ -100,6 +100,9 @@ public class K3OtherStockInLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         KingDeeOtherStockIn kingDeeOtherStockIn = kingDeeOtherStockInService.getById(billNo);
 
+        if (kingDeeOtherStockIn.getCancelStatus().equals(ExamineStatusEnum.OK.getKey()))
+            throw new RemoteServiceException("单已审批，无需审批");
+
         kingDeeOtherStockIn.setApproveDate(new Date());
         kingDeeOtherStockIn.setApproverId(adminUser.getNickName());
 

src/main/java/com/zfire/mall/manager/logic/k3/K3OtherStockOutLogic.java

@@ -99,6 +99,9 @@ public class K3OtherStockOutLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         KingDeeOtherStockOut kingDeeOtherStockOut = kingDeeOtherStockOutService.getById(billNo);
 
+        if (kingDeeOtherStockOut.getCancelStatus().equals(ExamineStatusEnum.OK.getKey()))
+            throw new RemoteServiceException("单已审批，无需审批");
+
         kingDeeOtherStockOut.setCancelStatus(cancelStatus);
         kingDeeOtherStockOut.setApproveDate(new Date());
         kingDeeOtherStockOut.setApproverId(adminUser.getNickName());

src/main/java/com/zfire/mall/manager/logic/k3/K3PurchaseStockInLogic.java

@@ -200,6 +200,9 @@ public class K3PurchaseStockInLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         KingDeePurchaseStockIn kingDeePurchaseStockIn = kingDeePurchaseStockInService.getById(billNo);
 
+        if (kingDeePurchaseStockIn.getCancelStatus().equals(ExamineStatusEnum.OK.getKey()))
+            throw new RemoteServiceException("单已审批，无需审批");
+
         kingDeePurchaseStockIn.setCancelStatus(cancelStatus);
         kingDeePurchaseStockIn.setApproveDate(new Date());
         kingDeePurchaseStockIn.setApproverId(adminUser.getNickName());

src/main/java/com/zfire/mall/manager/logic/k3/K3PurchaseStockOutLogic.java

@@ -101,6 +101,10 @@ public class K3PurchaseStockOutLogic {
     public void examine(String billNo, String cancelStatus) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         KingDeePurchaseStockOut kingDeePurchaseStockOut = kingDeePurchaseStockOutService.getById(billNo);
+
+        if (kingDeePurchaseStockOut.getCancelStatus().equals(ExamineStatusEnum.OK.getKey()))
+            throw new RemoteServiceException("单已审批，无需审批");
+
         kingDeePurchaseStockOut.setCancelStatus(cancelStatus);
 
         kingDeePurchaseStockOut.setApproveDate(new Date());

src/main/java/com/zfire/mall/manager/logic/k3/K3ReceiptLogic.java

@@ -486,6 +486,10 @@ public class K3ReceiptLogic {
     public void examine(String billNo, String cancelStatus) throws InterruptedException {
 
         KingDeeReceipt kingDeeReceipt = kingDeeReceiptService.getById(billNo);
+
+        if (kingDeeReceipt.getStatus().equals(ExamineStatusEnum.OK.getKey()))
+            throw new RemoteServiceException("单已审批，无需审批");
+
         kingDeeReceipt.setStatus(cancelStatus);
         kingDeeReceipt.updateById();
 
@@ -516,7 +520,7 @@ public class K3ReceiptLogic {
         List<CustomerWalletAmountBean> customerWalletAmountBeans = new ArrayList<>();
         //处理收款单/返利单逻辑/付款单
         for(KingDeeReceipt kingDeeReceipt : objects){
-            if(kingDeeReceipt == null || (!kingDeeReceipt.getStatus().equals("C") && !kingDeeReceipt.getStatus().equals("D"))){
+            if(kingDeeReceipt == null || (!kingDeeReceipt.getStatus().equals("OK"))){
                 continue;
             }
             if(org.apache.commons.lang3.StringUtils.isEmpty(kingDeeReceipt.getWalletId().trim()) || org.apache.commons.lang3.StringUtils.isEmpty(kingDeeReceipt.getCustomerId().trim())){
@@ -525,21 +529,6 @@ public class K3ReceiptLogic {
 
             //本次同步过来的钱
             BigDecimal amount = kingDeeReceipt.getAmount();
-            if(kingDeeReceipt.getStatus().equals("D")) {
-                amount = BigDecimal.valueOf(0);
-            }
-
-            //检查是否存在反审过来的单,如果之前存在审核通过的单，又有相同的单过来，代表该单这次被反审了，需要减掉它
-            KingDeeReceipt oldBill = kingDeeReceiptService.getById(kingDeeReceipt.getId());
-            if(oldBill != null && oldBill.getExamineTime() != null && kingDeeReceipt.getExamineTime() != null
-                    && oldBill.getExamineTime().getTime() == kingDeeReceipt.getExamineTime().getTime()){
-                log.info("【重复同步的收款单/付款单】id:"+kingDeeReceipt.getId());
-                continue;
-            }
-            if(oldBill != null && oldBill.getStatus().equals("C")){
-                BigDecimal subAmount = BigDecimal.valueOf(0).subtract(oldBill.getAmount());
-                customerWalletAmountBeans.add(this.doAmount(oldBill,subAmount,oldBill.getRemark()));
-            }
 
             customerWalletAmountBeans.add(this.doAmount(kingDeeReceipt,amount,kingDeeReceipt.getRemark()));
         }