需求

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

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.zfire.mall.manager.bean.k3.KingDeeOtherStockInAdd;
 import com.zfire.mall.manager.bean.k3.KingDeeOtherStockInDetail;
+import com.zfire.mall.manager.enums.ExamineStatusEnum;
 import com.zfire.mall.manager.exception.RemoteServiceException;
 import com.zfire.mall.manager.logic.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
@@ -47,6 +48,7 @@ public class K3OtherStockInLogic {
     public void add(KingDeeOtherStockInAdd kingDeePurchaseStockInAdd) {
         kingDeePurchaseStockInAdd.setId(IdWorker.getIdStr());
         kingDeePurchaseStockInAdd.setBillNo(kingDeePurchaseStockInAdd.getId());
+        kingDeePurchaseStockInAdd.setCancelStatus(ExamineStatusEnum.WAIT.getKey());
         kingDeePurchaseStockInAdd.insert();
 
         List<StockCorrespond> list = stockCorrespondService.lambdaQuery().list();
@@ -65,6 +67,8 @@ public class K3OtherStockInLogic {
 
 
             StockCorrespond stockCorrespond = collect.get(0);
+
+            kingDeeOtherStockIn.setStockName(stockCorrespond.getName());
         }
 
         kingDeeOtherStockInItemService.saveBatch(kingDeePurchaseStockInAdd.getKingDeeOtherStockInItems());

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

@@ -45,6 +45,7 @@ public class K3OtherStockOutLogic {
     public void add(KingDeeOtherStockOutAdd kingDeeOtherStockOutAdd) {
         kingDeeOtherStockOutAdd.setId(IdWorker.getIdStr());
         kingDeeOtherStockOutAdd.setBillNo(kingDeeOtherStockOutAdd.getId());
+        kingDeeOtherStockOutAdd.setCancelStatus(kingDeeOtherStockOutAdd.getId());
         kingDeeOtherStockOutAdd.insert();
 
         List<StockCorrespond> list = stockCorrespondService.lambdaQuery().list();
@@ -63,6 +64,7 @@ public class K3OtherStockOutLogic {
 
 
             StockCorrespond stockCorrespond = collect.get(0);
+            kingDeeOtherStockOutItem.setStockName(stockCorrespond.getName());
         }
 
         kingDeeOtherStockOutItemService.saveBatch(kingDeeOtherStockOutAdd.getKingDeeOtherStockOutItems());

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

@@ -140,6 +140,8 @@ public class K3PurchaseStockInLogic {
     public void add(KingDeePurchaseStockInAdd kingDeePurchaseStockInAdd) {
         kingDeePurchaseStockInAdd.setId(IdWorker.getIdStr());
         kingDeePurchaseStockInAdd.setBillNo(kingDeePurchaseStockInAdd.getId());
+        kingDeePurchaseStockInAdd.setCancelStatus(ExamineStatusEnum.WAIT.getKey());
+
         kingDeePurchaseStockInAdd.insert();
 
         List<StockCorrespond> list = stockCorrespondService.lambdaQuery().list();

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

@@ -46,6 +46,7 @@ public class K3PurchaseStockOutLogic {
     public void add(KingDeePurchaseStockOutAdd kingDeePurchaseStockInAdd) {
         kingDeePurchaseStockInAdd.setId(IdWorker.getIdStr());
         kingDeePurchaseStockInAdd.setBillNo(IdWorker.getIdStr());
+        kingDeePurchaseStockInAdd.setCancelStatus(ExamineStatusEnum.WAIT.getKey());
         kingDeePurchaseStockInAdd.insert();
 
         List<StockCorrespond> list = stockCorrespondService.lambdaQuery().list();
@@ -66,6 +67,8 @@ public class K3PurchaseStockOutLogic {
 
             StockCorrespond stockCorrespond = collect.get(0);
 
+            kingDeePurchaseStockOutItem.setStockName(stockCorrespond.getName());
+
         }
 
         kingDeePurchaseStockOutItemService.saveBatch(kingDeePurchaseStockInAdd.getKingDeePurchaseStockOutItems());

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

@@ -2,7 +2,6 @@ package com.zfire.mall.manager.logic.k3;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zfire.mall.manager.bean.ExcelData;
@@ -14,18 +13,17 @@ import com.zfire.mall.manager.enums.ExamineStatusEnum;
 import com.zfire.mall.manager.exception.RemoteServiceException;
 import com.zfire.mall.manager.logic.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
-import com.zfire.mall.manager.plus.service.KingDeeSupplierService;
-import com.zfire.mall.manager.plus.service.KingDeeTransferItemService;
-import com.zfire.mall.manager.plus.service.KingDeeTransferService;
-import com.zfire.mall.manager.plus.service.StockService;
+import com.zfire.mall.manager.plus.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -50,6 +48,9 @@ public class K3TransferLogic {
     @Autowired
     StockCommonLogic stockCommonLogic;
 
+    @Autowired
+    StockCorrespondService stockCorrespondService;
+
 
 //    public void allSync(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
 //        // 调用调拨单接口
@@ -142,9 +143,26 @@ public class K3TransferLogic {
     public void add(KingTransferAddOrUp kingTransferAdd) {
         kingTransferAdd.setId(IdWorker.getIdStr());
         kingTransferAdd.setBillNo(kingTransferAdd.getId());
+        kingTransferAdd.setCancelStatus(ExamineStatusEnum.WAIT.getKey());
         kingTransferAdd.insert();
+
+        List<StockCorrespond> list = stockCorrespondService.lambdaQuery().list();
         for (KingDeeTransferItem kingDeeTransferItem : kingTransferAdd.getKingDeeTransferItems()) {
             kingDeeTransferItem.setBillNo(kingTransferAdd.getId());
+
+
+
+            List<StockCorrespond> collect = list.stream().filter(item -> item.getId().equals(kingDeeTransferItem.getSrcStockId())).collect(Collectors.toList());
+            List<StockCorrespond> destStock = list.stream().filter(item -> item.getId().equals(kingDeeTransferItem.getDestStockId())).collect(Collectors.toList());
+
+            if (CollectionUtils.isEmpty(collect))
+                throw new RemoteServiceException("未找到对应仓库");
+
+
+            StockCorrespond stockCorrespond = collect.get(0);
+            StockCorrespond stockDestCorrespond = destStock.get(0);
+            kingDeeTransferItem.setSrcStockName(stockCorrespond.getName());
+            kingDeeTransferItem.setDestStockName(stockDestCorrespond.getName());
         }
 
         kingDeeTransferItemService.saveBatch(kingTransferAdd.getKingDeeTransferItems());

src/main/resources/generator-dev.properties

@@ -1,5 +1,5 @@
 java.package=com.zfire.mall.manager
-jdbc.url=jdbc:mysql://121.43.111.127:3306/supply_dev?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8
+jdbc.url=jdbc:mysql://121.43.111.127:3306/supply_overseas?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8
 jdbc.username=root
 jdbc.pwd=xch!eCdvc124@
 

src/main/resources/generator-test.properties

@@ -1,5 +1,5 @@
 java.package=com.zfire.mall.manager
-jdbc.url=jdbc:mysql://121.43.111.127:3306/supply_dev?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8
+jdbc.url=jdbc:mysql://121.43.111.127:3306/supply_overseas?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8
 jdbc.username=root
 jdbc.pwd=xch!eCdvc124@