Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basevehicleout;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
@@ -46,6 +47,7 @@ import com.yxt.common.base.utils.WordUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,6 +60,7 @@ import java.util.*;
  * @Date 2022/9/23 14:46
  * @Description
  */
+@Slf4j
 @Service
 public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapper, BaseVehicleOut> {
 
@@ -89,6 +92,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private BasePurchaseSystemService basePurchaseSystemService;
 
     public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
+        log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto));
         ResultBean rb = ResultBean.fireFail();
         Boolean b = false;
        /* List<BaseVehicleOutQuery> list = dto.getQueryList();
@@ -281,7 +285,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 dto.setCustomerNo(bdCustomer.getFNumber());
             }
             SalOutStock salOutStock = createSalOutStock(baseVehicle, dto);
+            log.info("BaseVehicleOutService-vehicleOut-287:{}", JSONObject.toJSONString(salOutStock));
             finKingDeeFeign.draftSalOutStock(salOutStock);
+            log.info("BaseVehicleOutService-vehicleOut-289:{}", JSONObject.toJSONString(salOutStock));
             //推送销售专员信息
             BDEmpinfo bdEmpinfo = new BDEmpinfo();
             String staffSid = dto.getStaffSid();
@@ -301,12 +307,15 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             finKingDeeFeign.saveBDEmpinfo(bdEmpinfo);
         } catch (Exception e) {
             log.error(e.getMessage());
+            e.printStackTrace();
         }
         //推送金蝶上装/挂车销售出库单
         String trailerOrInstall = dto.getTrailerOrInstall();
         if (StringUtils.isNotBlank(trailerOrInstall)) {
             SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehicle, dto);
+            log.info("BaseVehicleOutService-vehicleOut-313:{}", JSONObject.toJSONString(salOutStock));
             finKingDeeFeign.draftSalOutStock(salOutStock);
+            log.info("BaseVehicleOutService-vehicleOut-316:{}", JSONObject.toJSONString(salOutStock));
             List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
             for (SalOutStock.FEntity entity : fEntity) {
                 String substring = entity.getFMaterialID().substring(entity.getFMaterialID().length() - 1);