问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java

@@ -81,4 +81,7 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
      * @return
      */
     IPage<BaseTrailerSearchVo> searchPage(IPage<BaseTrailerSearchVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseTrailerSearchVo> qw);
+
+    @Select("select * from base_trailer where vehSid = #{sid}")
+    BaseTrailerDetailsVo fetchByVehSid(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -382,4 +382,8 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         }
         return qw;
     }
+
+    public BaseTrailerDetailsVo fetchByVehSid(String sid) {
+        return baseMapper.fetchByVehSid(sid);
+    }
 }

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

@@ -5,10 +5,15 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
+import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicleout.*;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDto;
 import com.yxt.anrui.base.biz.basemiddleman.BaseMiddlemanService;
+import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
+import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
@@ -57,6 +62,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private CrmCustomerTempFeign crmCustomerTempFeign;
     @Autowired
     private SysStaffinfoFeign sysStaffinfoFeign;
+    @Autowired
+    private BaseTrailerService baseTrailerService;
+    @Autowired
+    private BaseVehinstallService baseVehinstallService;
 
     public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -171,10 +180,207 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         } catch (Exception e) {
             log.error(e.getMessage());
         }
-
+        //推送金蝶上装/挂车销售出库单
+        SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehicle, dto);
+        ResultBean resultBean1 = finKingDeeFeign.draftSalOutStock(salOutStock);
         return rb.success();
     }
 
+    private SalOutStock createSzOrGcSalOutStock(BaseVehicle baseVehicle, BaseVehicleOutDto dto) {
+        SalOutStock salOutStock = new SalOutStock();
+        BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerService.fetchByVehSid(baseVehicle.getSid());
+        BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(baseVehicle.getVinNo(), baseVehicle.getCreateOrgSid());
+        if (baseTrailerDetailsVo != null){
+            //日期
+            salOutStock.setFDate(DateUtil.today());
+            //分公司id
+            salOutStock.setFSaleOrgId(baseVehicle.getOrgCode());
+            //客户
+            salOutStock.setFCustomerID(dto.getCustomerNo());
+            //销售部门id
+            String orgDeptSid = dto.getOrgSid();
+            ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid);
+            if (resultBean.getSuccess()) {
+                SysOrganizationVo vo = resultBean.getData();
+                if (vo != null) {
+                    salOutStock.setFSaleDeptID(vo.getOrgCode());
+                }
+            }
+            //项目类别key和项目类别type
+            salOutStock.setF_PAEZ_AssistantType("payType");
+            salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey());
+            //中介单位
+            salOutStock.setF_PAEZ_Base(dto.getMiddleCodeOne());
+            //物料列表
+            List<SalOutStock.FEntity> fEntityList = new ArrayList<>();
+            SalOutStock.FEntity fEntity = new SalOutStock.FEntity();
+            //单价
+            fEntity.setFPrice(baseTrailerDetailsVo.getDealPrice());
+            //物料编码
+            fEntity.setFMaterialID(baseTrailerDetailsVo.getVinNo().substring(dto.getVinNo().length() - 8) + "G");
+            //仓库id
+            fEntity.setFStockID(baseVehicle.getLocationCode());
+            //销售折让
+            if (StringUtils.isNotBlank(dto.getSalesAllowance())) {
+                fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance());
+            }
+            if (StringUtils.isNotBlank(dto.getGiftsDescription())) {
+                fEntity.setF_PAEZ_Decimal4(dto.getGiftsDescription());
+            }
+            //返利金额
+            fEntity.setF_PAEZ_Decimal("0");
+            String remarks = dto.getRemarks();
+            String note = "";
+            if (StringUtils.isNotBlank(remarks)) {
+                note = note + remarks;
+            }
+            //备注
+            if (StringUtils.isNotBlank(dto.getMiddleOne())) {
+                if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+                        if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                            note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "," + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。";
+                            //返利金额
+                            fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString());
+                        } else {
+                            note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
+//                        fEntity.setFEntrynote(note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。");
+                            //返利金额
+                            fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
+                        }
+
+                    } else {
+                        if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                            note = note + "  返利情况：" + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。";
+                            //返利金额
+                            fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyTwo()).toString());//dto.getRebateMoneyOne()
+                        }
+                    }
+
+                } else {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+                        note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
+                        //返利金额
+                        fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
+                    }
+                }
+            } else {
+                if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                        note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
+                        //返利金额
+                        fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
+                    }
+                }
+
+            }
+            if (StringUtils.isNotBlank(note)) {
+                fEntity.setFEntrynote(note);
+            }
+            fEntityList.add(fEntity);
+            if (fEntityList.size() > 0) {
+                salOutStock.setFEntity(fEntityList);
+                return salOutStock;
+            } else {
+                return null;
+            }
+        }else if (baseVehinstallDetailsVo != null){
+            //日期
+            salOutStock.setFDate(DateUtil.today());
+            //分公司id
+            salOutStock.setFSaleOrgId(baseVehicle.getOrgCode());
+            //客户
+            salOutStock.setFCustomerID(dto.getCustomerNo());
+            //销售部门id
+            String orgDeptSid = dto.getOrgSid();
+            ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid);
+            if (resultBean.getSuccess()) {
+                SysOrganizationVo vo = resultBean.getData();
+                if (vo != null) {
+                    salOutStock.setFSaleDeptID(vo.getOrgCode());
+                }
+            }
+            //项目类别key和项目类别type
+            salOutStock.setF_PAEZ_AssistantType("payType");
+            salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey());
+            //中介单位
+            salOutStock.setF_PAEZ_Base(dto.getMiddleCodeOne());
+            //物料列表
+            List<SalOutStock.FEntity> fEntityList = new ArrayList<>();
+            SalOutStock.FEntity fEntity = new SalOutStock.FEntity();
+            //单价
+            fEntity.setFPrice(baseVehinstallDetailsVo.getCostPrice());
+            //物料编码
+            fEntity.setFMaterialID(baseVehinstallDetailsVo.getVinNo().substring(dto.getVinNo().length() - 8) + "SZ");
+            //仓库id
+            fEntity.setFStockID(baseVehicle.getLocationCode());
+            //销售折让
+            if (StringUtils.isNotBlank(dto.getSalesAllowance())) {
+                fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance());
+            }
+            if (StringUtils.isNotBlank(dto.getGiftsDescription())) {
+                fEntity.setF_PAEZ_Decimal4(dto.getGiftsDescription());
+            }
+            //返利金额
+            fEntity.setF_PAEZ_Decimal("0");
+            String remarks = dto.getRemarks();
+            String note = "";
+            if (StringUtils.isNotBlank(remarks)) {
+                note = note + remarks;
+            }
+            //备注
+            if (StringUtils.isNotBlank(dto.getMiddleOne())) {
+                if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+                        if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                            note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "," + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。";
+                            //返利金额
+                            fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString());
+                        } else {
+                            note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
+                            //返利金额
+                            fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
+                        }
+
+                    } else {
+                        if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                            note = note + "  返利情况：" + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。";
+                            //返利金额
+                            fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyTwo()).toString());//dto.getRebateMoneyOne()
+                        }
+                    }
+
+                } else {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+                        note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
+                        //返利金额
+                        fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
+                    }
+                }
+            } else {
+                if (StringUtils.isNotBlank(dto.getMiddleTwo())) {
+                    if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+                        note = note + "  返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。";
+                        //返利金额
+                        fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString());
+                    }
+                }
+
+            }
+            if (StringUtils.isNotBlank(note)) {
+                fEntity.setFEntrynote(note);
+            }
+            fEntityList.add(fEntity);
+            if (fEntityList.size() > 0) {
+                salOutStock.setFEntity(fEntityList);
+                return salOutStock;
+            } else {
+                return null;
+            }
+        }
+        return null;
+    }
+
     public ResultBean isUpdateOrInsertCrm(BaseVehicleOutDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String isUpdateOrInsertCrm = dto.getIsUpdateOrInsertCrm();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -64,4 +65,7 @@ public interface BaseVehinstallMapper extends BaseMapper<BaseVehinstall> {
 	List<String> selectListVo(String createOrgSid);
 
     List<BaseVehinstall> selectByOrgSidAndVin(@Param("useOrgSid") String orgSid, @Param("vinNo") String vin);
+
+	@Select("select * from base_vehinstall where createOrg = #{createOrgSid} and vinNo = #{vinNo}")
+    BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -213,4 +213,8 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
 	public List<BaseVehinstall> selectByOrgSidAndVin(String orgSid, String vin) {
 		return baseMapper.selectByOrgSidAndVin(orgSid,vin);
 	}
+
+	public BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(String vinNo, String createOrgSid) {
+		return baseMapper.fetchByVinNoAndOrgSid(vinNo,createOrgSid);
+	}
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicing.java

@@ -66,5 +66,8 @@ public class FinCompanyInvoicing extends BaseEntity {
     private String useOrgSid; // 分公司sid
 	@ApiModelProperty("分公司名称")
     private String useOrgName; // 分公司名称
-
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid; // 采购系统sid
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java

@@ -67,5 +67,8 @@ public class FinCompanyInvoicingDetailsVo implements Vo {
     private String useOrgSid; // 分公司sid
 	@ApiModelProperty("分公司名称")
     private String useOrgName; // 分公司名称
-
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid; // 采购系统sid
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDto.java

@@ -67,5 +67,8 @@ public class FinCompanyInvoicingDto implements Dto {
     private String useOrgSid; // 分公司sid
 	@ApiModelProperty("分公司名称")
     private String useOrgName; // 分公司名称
-
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid; // 采购系统sid
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java

@@ -51,5 +51,8 @@ public class FinCompanyInvoicingQuery implements Query {
 
 	@ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
-
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath; // 组织全路径
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid; // 采购系统sid
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java

@@ -67,5 +67,8 @@ public class FinCompanyInvoicingVo implements Vo {
     private String useOrgSid; // 分公司sid
 	@ApiModelProperty("分公司名称")
     private String useOrgName; // 分公司名称
-
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid; // 采购系统sid
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -4,7 +4,9 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo">
-		SELECT * FROM fin_company_invoicing <where> ${ew.sqlSegment} </where>
+		SELECT fci.* FROM fin_company_invoicing fci
+		LEFT JOIN anrui_portal.sys_organization so ON fci.useOrgSid = so.sid
+		<where> ${ew.sqlSegment} </where>
 	</select>
 	
 	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo">

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.fincompanyinvoicing;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -43,6 +45,7 @@ import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
 
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -60,6 +63,10 @@ import java.util.List;
  */
 @Service
 public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInvoicingMapper, FinCompanyInvoicing> {
+
+    @Resource
+    private SysOrganizationFeign sysOrganizationFeign;
+
     private QueryWrapper<FinCompanyInvoicing> createQueryWrapper(FinCompanyInvoicingQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -70,8 +77,21 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
     public PagerVo<FinCompanyInvoicingVo> listPageVo(PagerQuery<FinCompanyInvoicingQuery> pq) {
         FinCompanyInvoicingQuery query = pq.getParams();
         QueryWrapper<FinCompanyInvoicing> qw = new QueryWrapper<>();
+        String orgSidPath = query.getOrgSidPath();
+        SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
+        String orgLevelKey = data.getOrgLevelKey();
+        if ("2".equals(orgLevelKey)) {
+            orgSidPath = orgSidPath.substring(0, 73);
+            qw.like("so.orgSidPath", orgSidPath);
+        } else if ("3".equals(orgLevelKey)) {
+            String orgSid = orgSidPath.substring(74, 110);
+            qw.eq("fci.useOrgSid", orgSid);
+        }
         if (StringUtils.isNotBlank(query.getUseOrgSid())) {
-            qw.eq("useOrgSid", query.getUseOrgSid());
+            qw.eq("fci.useOrgSid", query.getUseOrgSid());
+        }
+        if (StringUtils.isNotBlank(query.getPurchaseSystemSid())) {
+            qw.eq("fci.purchaseSystemSid", query.getPurchaseSystemSid());
         }
         IPage<FinCompanyInvoicing> page = PagerUtil.queryToPage(pq);
         IPage<FinCompanyInvoicingVo> pagging = baseMapper.selectPageVo(page, qw);