需求

src/main/java/com/zfire/mall/manager/bean/k3/v2/KingTransferVO.java

@@ -1,6 +1,7 @@
 package com.zfire.mall.manager.bean.k3.v2;
 
 import com.zfire.mall.manager.annotation.ZfireField;
+import com.zfire.mall.manager.enums.ExamineStatusEnum;
 import com.zfire.mall.manager.enums.K3CommonStatusEnum;
 import com.zfire.mall.manager.enums.K3TransferTypeEnum;
 import io.swagger.annotations.ApiModel;
@@ -60,8 +61,8 @@ public class KingTransferVO {
     private String billType;
 
     @ZfireField(tbName = "a")
-    @ApiModelProperty(value = "单据状态")
-    private String documentStatus;
+    @ApiModelProperty(value = "状态")
+    private ExamineStatusEnum cancelStatus;
 
 
     @ZfireField(tbName = "a")

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

@@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zfire.mall.manager.bean.ExcelData;
+import com.zfire.mall.manager.bean.admin.AdminUserCom;
 import com.zfire.mall.manager.bean.k3.*;
 import com.zfire.mall.manager.bean.pick.PickManagerBean;
 import com.zfire.mall.manager.commonmapper.manage.TransferMapper;
 import com.zfire.mall.manager.constant.KingDeeCons;
 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.*;
@@ -51,6 +53,9 @@ public class K3TransferLogic {
     @Autowired
     StockCorrespondService stockCorrespondService;
 
+    @Autowired
+    CommonLogic commonLogic;
+
 
 //    public void allSync(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
 //        // 调用调拨单接口
@@ -143,6 +148,7 @@ public class K3TransferLogic {
     public void add(KingTransferAddOrUp kingTransferAdd) {
         kingTransferAdd.setId(IdWorker.getIdStr());
         kingTransferAdd.setBillNo(kingTransferAdd.getId());
+        kingTransferAdd.setFDate(new Date());
         kingTransferAdd.setCancelStatus(ExamineStatusEnum.WAIT.getKey());
         kingTransferAdd.insert();
 
@@ -183,8 +189,12 @@ public class K3TransferLogic {
     @Transactional(rollbackFor = Exception.class)
     public void examine(String billNo, String cancelStatus) {
 
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+
         KingDeeTransfer kingDeeTransfer = kingDeeTransferService.getById(billNo);
         kingDeeTransfer.setCancelStatus(cancelStatus);
+        kingDeeTransfer.setApproveDate(new Date());
+        kingDeeTransfer.setApproverId(adminUser.getNickName());
         kingDeeTransfer.updateById();
 
         if (cancelStatus.equals(ExamineStatusEnum.OK.getKey())) {