需求

src/main/java/com/zfire/mall/manager/bean/stock/KingDeeOtherStockOutVO.java

@@ -37,7 +37,7 @@ public class KingDeeOtherStockOutVO   {
     @ApiModelProperty(value = "单据编号")
     private String billNo;
 
-    @ApiModelProperty(value = "入库日期")
+    @ApiModelProperty(value = "出库日期")
     private Date forDate;
 
     @ZfireField(hide = true)

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

@@ -106,11 +106,15 @@ public class K3OtherStockInLogic {
         kingDeeOtherStockIn.setCancelStatus(cancelStatus);
         kingDeeOtherStockIn.updateById();
 
-        List<KingDeeOtherStockInItem> kingDeeOtherStockInItems = kingDeeOtherStockInItemService.lambdaQuery().eq(KingDeeOtherStockInItem::getBillNo, billNo).list();
+        if (kingDeeOtherStockIn.getCancelStatus().equals(ExamineStatusEnum.OK.getKey())) {
 
-        for (KingDeeOtherStockInItem kingDeeOtherStockInItem : kingDeeOtherStockInItems) {
-            this.stockAdd(kingDeeOtherStockIn,kingDeeOtherStockInItem);
+            List<KingDeeOtherStockInItem> kingDeeOtherStockInItems = kingDeeOtherStockInItemService.lambdaQuery().eq(KingDeeOtherStockInItem::getBillNo, billNo).list();
 
+
+                for (KingDeeOtherStockInItem kingDeeOtherStockInItem : kingDeeOtherStockInItems) {
+                    this.stockAdd(kingDeeOtherStockIn, kingDeeOtherStockInItem);
+
+                }
         }
     }
 

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

@@ -2,11 +2,13 @@ package com.zfire.mall.manager.logic.k3;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.zfire.mall.manager.bean.admin.AdminUserCom;
 import com.zfire.mall.manager.bean.k3.KingDeeOtherStockInAdd;
 import com.zfire.mall.manager.bean.k3.KingDeeOtherStockOutAdd;
 import com.zfire.mall.manager.bean.k3.KingDeeOtherStockOutDetail;
 import com.zfire.mall.manager.enums.ExamineStatusEnum;
 import com.zfire.mall.manager.exception.RemoteServiceException;
+import com.zfire.mall.manager.logic.common.CommonLogic;
 import com.zfire.mall.manager.logic.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
 import com.zfire.mall.manager.plus.service.KingDeeOtherStockOutItemService;
@@ -20,6 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -43,9 +46,13 @@ public class K3OtherStockOutLogic {
     @Autowired
     StockCorrespondService stockCorrespondService;
 
+    @Autowired
+    CommonLogic commonLogic;
+
     public void add(KingDeeOtherStockOutAdd kingDeeOtherStockOutAdd) {
         kingDeeOtherStockOutAdd.setId(IdWorker.getIdStr());
         kingDeeOtherStockOutAdd.setBillNo(kingDeeOtherStockOutAdd.getId());
+        kingDeeOtherStockOutAdd.setForDate(new Date());
         kingDeeOtherStockOutAdd.setCancelStatus(ExamineStatusEnum.WAIT.getKey());
         kingDeeOtherStockOutAdd.insert();
 
@@ -86,16 +93,25 @@ public class K3OtherStockOutLogic {
         kingDeeOtherStockOutItemService.saveBatch(kingDeeOtherStockOutAdd.getKingDeeOtherStockOutItems());
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void examine(String billNo, String cancelStatus) {
+
+        AdminUserCom adminUser = commonLogic.getAdminUser();
         KingDeeOtherStockOut kingDeeOtherStockOut = kingDeeOtherStockOutService.getById(billNo);
 
         kingDeeOtherStockOut.setCancelStatus(cancelStatus);
+        kingDeeOtherStockOut.setApproveDate(new Date());
+        kingDeeOtherStockOut.setApproverId(adminUser.getNickName());
         kingDeeOtherStockOut.updateById();
 
-        List<KingDeeOtherStockOutItem> kingDeeOtherStockOutItems = kingDeeOtherStockOutItemService.lambdaQuery()
-                .eq(KingDeeOtherStockOutItem::getBillNo, billNo).list();
-        for (KingDeeOtherStockOutItem kingDeeOtherStockOutItem : kingDeeOtherStockOutItems) {
-            this.stockSub(kingDeeOtherStockOut,kingDeeOtherStockOutItem);
+        if (kingDeeOtherStockOut.getCancelStatus().equals(ExamineStatusEnum.OK.getKey())) {
+
+            List<KingDeeOtherStockOutItem> kingDeeOtherStockOutItems = kingDeeOtherStockOutItemService.lambdaQuery()
+                    .eq(KingDeeOtherStockOutItem::getBillNo, billNo).list();
+
+            for (KingDeeOtherStockOutItem kingDeeOtherStockOutItem : kingDeeOtherStockOutItems) {
+                this.stockSub(kingDeeOtherStockOut, kingDeeOtherStockOutItem);
+            }
         }
     }