‘linchangsheng’ 7 月之前
父節點
當前提交
8f4f264e2b

+ 22 - 0
src/main/java/com/zfire/mall/manager/logic/k3/K3OtherStockInLogic.java

@@ -5,19 +5,24 @@ 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.exception.RemoteServiceException;
 import com.zfire.mall.manager.logic.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
 import com.zfire.mall.manager.plus.service.KingDeeOtherStockInItemService;
 import com.zfire.mall.manager.plus.service.KingDeeOtherStockInService;
+import com.zfire.mall.manager.plus.service.StockCorrespondService;
 import com.zfire.mall.manager.plus.service.StockService;
 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.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -35,14 +40,31 @@ public class K3OtherStockInLogic {
     @Autowired
     StockCommonLogic stockCommonLogic;
 
+    @Autowired
+    StockCorrespondService stockCorrespondService;
+
 
     public void add(KingDeeOtherStockInAdd kingDeePurchaseStockInAdd) {
         kingDeePurchaseStockInAdd.setId(IdWorker.getIdStr());
         kingDeePurchaseStockInAdd.setBillNo(kingDeePurchaseStockInAdd.getId());
         kingDeePurchaseStockInAdd.insert();
 
+        List<StockCorrespond> list = stockCorrespondService.lambdaQuery().list();
+
         for (KingDeeOtherStockInItem kingDeeOtherStockIn : kingDeePurchaseStockInAdd.getKingDeeOtherStockInItems()) {
             kingDeeOtherStockIn.setBillNo(kingDeeOtherStockIn.getId());
+
+            if (StringUtils.isEmpty(kingDeeOtherStockIn.getStockId()))
+                throw new RemoteServiceException("仓库空了");
+
+
+            List<StockCorrespond> collect = list.stream().filter(item -> item.getId().equals(kingDeeOtherStockIn.getStockId())).collect(Collectors.toList());
+
+            if (CollectionUtils.isEmpty(collect))
+                throw new RemoteServiceException("未找到对应仓库");
+
+
+            StockCorrespond stockCorrespond = collect.get(0);
         }
 
         kingDeeOtherStockInItemService.saveBatch(kingDeePurchaseStockInAdd.getKingDeeOtherStockInItems());

+ 21 - 0
src/main/java/com/zfire/mall/manager/logic/k3/K3OtherStockOutLogic.java

@@ -10,13 +10,17 @@ import com.zfire.mall.manager.logic.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
 import com.zfire.mall.manager.plus.service.KingDeeOtherStockOutItemService;
 import com.zfire.mall.manager.plus.service.KingDeeOtherStockOutService;
+import com.zfire.mall.manager.plus.service.StockCorrespondService;
 import com.zfire.mall.manager.plus.service.StockService;
 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.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -35,13 +39,30 @@ public class K3OtherStockOutLogic {
     @Autowired
     StockCommonLogic stockCommonLogic;
 
+    @Autowired
+    StockCorrespondService stockCorrespondService;
+
     public void add(KingDeeOtherStockOutAdd kingDeeOtherStockOutAdd) {
         kingDeeOtherStockOutAdd.setId(IdWorker.getIdStr());
         kingDeeOtherStockOutAdd.setBillNo(kingDeeOtherStockOutAdd.getId());
         kingDeeOtherStockOutAdd.insert();
 
+        List<StockCorrespond> list = stockCorrespondService.lambdaQuery().list();
+
         for (KingDeeOtherStockOutItem kingDeeOtherStockOutItem : kingDeeOtherStockOutAdd.getKingDeeOtherStockOutItems()) {
             kingDeeOtherStockOutItem.setBillNo(kingDeeOtherStockOutAdd.getId());
+
+            if (StringUtils.isEmpty(kingDeeOtherStockOutItem.getStockId()))
+                throw new RemoteServiceException("仓库空了");
+
+
+            List<StockCorrespond> collect = list.stream().filter(item -> item.getId().equals(kingDeeOtherStockOutItem.getStockId())).collect(Collectors.toList());
+
+            if (CollectionUtils.isEmpty(collect))
+                throw new RemoteServiceException("未找到对应仓库");
+
+
+            StockCorrespond stockCorrespond = collect.get(0);
         }
 
         kingDeeOtherStockOutItemService.saveBatch(kingDeeOtherStockOutAdd.getKingDeeOtherStockOutItems());

+ 20 - 0
src/main/java/com/zfire/mall/manager/logic/k3/K3PurchaseStockInLogic.java

@@ -12,6 +12,7 @@ import com.zfire.mall.manager.bean.stock.KingDeePurchaseStockInAdd;
 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.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
 import com.zfire.mall.manager.plus.service.*;
@@ -24,6 +25,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -47,6 +49,9 @@ public class K3PurchaseStockInLogic {
     @Autowired
     StockCommonLogic stockCommonLogic;
 
+    @Autowired
+    StockCorrespondService stockCorrespondService;
+
 
 //    public void allSync(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
 //        // 调用入库单接口
@@ -137,8 +142,23 @@ public class K3PurchaseStockInLogic {
         kingDeePurchaseStockInAdd.setBillNo(kingDeePurchaseStockInAdd.getId());
         kingDeePurchaseStockInAdd.insert();
 
+        List<StockCorrespond> list = stockCorrespondService.lambdaQuery().list();
+
         for (KingDeePurchaseStockInItem kingDeePurchaseStockInItem : kingDeePurchaseStockInAdd.getKingDeePurchaseStockInItem()) {
             kingDeePurchaseStockInItem.setBillNo(kingDeePurchaseStockInAdd.getBillNo());
+            if (StringUtils.isEmpty(kingDeePurchaseStockInItem.getStockId()))
+                throw new RemoteServiceException("仓库空了");
+
+
+            List<StockCorrespond> collect = list.stream().filter(item -> item.getId().equals(kingDeePurchaseStockInItem.getStockId())).collect(Collectors.toList());
+
+            if (CollectionUtils.isEmpty(collect))
+                throw new RemoteServiceException("未找到对应仓库");
+
+
+            StockCorrespond stockCorrespond = collect.get(0);
+            kingDeePurchaseStockInItem.setStockName(stockCorrespond.getName());
+
         }
 
         kingDeePurchaseStockInItemService.saveBatch(kingDeePurchaseStockInAdd.getKingDeePurchaseStockInItem());

+ 22 - 0
src/main/java/com/zfire/mall/manager/logic/k3/K3PurchaseStockOutLogic.java

@@ -9,15 +9,19 @@ import com.zfire.mall.manager.logic.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
 import com.zfire.mall.manager.plus.service.KingDeePurchaseStockOutItemService;
 import com.zfire.mall.manager.plus.service.KingDeePurchaseStockOutService;
+import com.zfire.mall.manager.plus.service.StockCorrespondService;
 import com.zfire.mall.manager.plus.service.StockService;
 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.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -29,6 +33,9 @@ public class K3PurchaseStockOutLogic {
     @Autowired
     KingDeePurchaseStockOutService kingDeePurchaseStockOutService;
 
+    @Autowired
+    StockCorrespondService stockCorrespondService;
+
 
     @Autowired
     StockService stockService;
@@ -41,9 +48,24 @@ public class K3PurchaseStockOutLogic {
         kingDeePurchaseStockInAdd.setBillNo(IdWorker.getIdStr());
         kingDeePurchaseStockInAdd.insert();
 
+        List<StockCorrespond> list = stockCorrespondService.lambdaQuery().list();
+
         for (KingDeePurchaseStockOutItem kingDeePurchaseStockOutItem : kingDeePurchaseStockInAdd.getKingDeePurchaseStockOutItems()) {
 
             kingDeePurchaseStockOutItem.setBillNo(kingDeePurchaseStockInAdd.getBillNo());
+
+            if (StringUtils.isEmpty(kingDeePurchaseStockOutItem.getStockId()))
+                throw new RemoteServiceException("仓库空了");
+
+
+            List<StockCorrespond> collect = list.stream().filter(item -> item.getId().equals(kingDeePurchaseStockOutItem.getStockId())).collect(Collectors.toList());
+
+            if (CollectionUtils.isEmpty(collect))
+                throw new RemoteServiceException("未找到对应仓库");
+
+
+            StockCorrespond stockCorrespond = collect.get(0);
+
         }
 
         kingDeePurchaseStockOutItemService.saveBatch(kingDeePurchaseStockInAdd.getKingDeePurchaseStockOutItems());