问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java

@@ -88,4 +88,7 @@ public class BaseVehicleOut extends BaseEntity {
     private String trailerOrInstallDealPrice;
     @ApiModelProperty("总成交价")
     private String totalDealPrice;
+
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java

@@ -67,4 +67,7 @@ public class BaseVehicleOutDetailsVo implements Vo {
     private String trailerOrInstallDealPrice;
     @ApiModelProperty("总成交价")
     private String totalDealPrice;
+
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java

@@ -79,6 +79,9 @@ public class BaseVehicleOutDto implements Dto {
     @ApiModelProperty("总成交价")
     private String totalDealPrice;
 
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+
     @ApiModelProperty("是否要修改客户")
     private String isUpdateOrInsertCrm; // 是否要修改客户
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java

@@ -95,4 +95,7 @@ public class BaseVehicleOutVo implements Vo {
 
     @ApiModelProperty("销售指导价")
     private String guidedPrice; // 销售指导价
+
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
 }

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

@@ -30,4 +30,6 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
     BaseVehicleOutDetailsVo details(String sid);
 
     int selectCountBySidVin(String vinSid);
+
+    String selectNum(String billNo);
 }

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

@@ -54,7 +54,8 @@
         bvc.guidedPrice
         from base_vehicle_out bvo
         left join base_vehicle bv on bv.sid = bvo.vinSid
-        left join base_vehmodel_config bvc on bv.modelSid = bvc.modelSid and bv.modelConfigSid = bvc.configurationItemsSid and bv.createOrgSid = bvc.useOrgSid
+        left join base_vehmodel_config bvc on bv.modelSid = bvc.modelSid and bv.modelConfigSid =
+        bvc.configurationItemsSid and bv.createOrgSid = bvc.useOrgSid
         LEFT JOIN anrui_portal.sys_organization so ON bvo.createOrgSid = so.sid
         <where>
             ${ew.sqlSegment}
@@ -95,4 +96,12 @@
         from base_vehicle_out
         where vinSid = #{vinSid}
     </select>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT (billNo, 4)
+        from base_vehicle_out
+        where billNo LIKE concat(#{billNo}, '%')
+        order by id desc
+                limit 1
+    </select>
 </mapper>

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

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.biz.basevehicleout;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,6 +20,7 @@ import com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService;
 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.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
@@ -180,7 +182,18 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
             baseVehicleOut.setRebateMoneyTwo(new BigDecimal(dto.getRebateMoneyTwo()));
         }
+        String billNo = "";
+        String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+        billNo = "XSCKD" + sysOrganizationVo.getOrgCode() + date;
+        String i = baseMapper.selectNum(billNo);
+        if (StringUtils.isNotBlank(i)) {
+            billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+        } else {
+            billNo = Rule.getBillNo(billNo, 0);
+        }
+        baseVehicleOut.setBillNo(billNo);
         baseMapper.insert(baseVehicleOut);
+        dto.setBillNo(billNo);
         //更新车辆台账的出库状态等值，库存状态修改为出库，销售日期修改为当天，成交价，备注
         String remarks = baseVehicleOut.getConcatNo() + baseVehicleOut.getType();
         BaseVehicle baseVehicle = baseVehicleService.fetchBySid(dto.getVinSid());
@@ -585,6 +598,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
 
     private SalOutStock createSalOutStock(BaseVehicle baseVehicle, BaseVehicleOutDto dto) {
         SalOutStock salOutStock = new SalOutStock();
+        //单据编号
+        salOutStock.setFBillNo(dto.getBillNo());
         //日期
         salOutStock.setFDate(DateUtil.today());
         //分公司id

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java

@@ -14,6 +14,12 @@ import java.util.List;
  */
 @Data
 public class SalOutStock {
+    /**
+     * 单据编号:FBillNo  (必填项)
+     */
+    @JsonProperty("FBillNo")
+    @NotBlank(message = "FBillNo不能为空")
+    public String FBillNo;
     /**
      * 日期:FDate  (必填项)
      */

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_model.json

@@ -3,6 +3,7 @@
   "FBillTypeID": {
     "FNUMBER": "XSCKD01_SYS"
   },
+  "FBillNo": "@KD_FBillNo",
   "FDate": "@KD_FDate",
   "FSaleOrgId": {
     "FNumber": "@KD_FSaleOrgId"