问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailer.java

@@ -85,4 +85,6 @@ public class BaseTrailer extends BaseEntity {
     private String useOrgSid;
     @ApiModelProperty("分公司名称")
     private String useOrgName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDto.java

@@ -54,6 +54,8 @@ import java.util.List;
 public class BaseTrailerDto implements Dto {
 	
 	private static final long serialVersionUID = -2327928474477683203L;
+	@ApiModelProperty("userSid")
+	private String userSid;
 	@ApiModelProperty("挂车车型sid")
 	private String trailerModelSid;
 	@ApiModelProperty("挂车车架号")
@@ -86,6 +88,8 @@ public class BaseTrailerDto implements Dto {
 	private String useOrgSid;
 	@ApiModelProperty("分公司名称")
 	private String useOrgName;
+	@ApiModelProperty("单据编号")
+	private String billNo;
 	@ApiModelProperty("部门sid")
 	private String departmentSid;
 	@ApiModelProperty("发票照片")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstall.java

@@ -80,5 +80,6 @@ public class BaseVehinstall extends BaseEntity {
     private String useOrgSid; // 使用组织
 	@ApiModelProperty("创建组织")
     private String createOrg; // 创建组织
-
+    @ApiModelProperty("单据编号")
+    private String billNo;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallDto.java

@@ -51,6 +51,8 @@ public class BaseVehinstallDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("userSid")
+    private String userSid;
 	@ApiModelProperty("上装配置sid")
     private String mainSid; // 上装配置sid
 	@ApiModelProperty("品牌sid")
@@ -83,4 +85,6 @@ public class BaseVehinstallDto implements Dto {
     private String createOrg; // 创建组织
     @ApiModelProperty("部门sid")
     private String departmentSid; // 部门sid
+    @ApiModelProperty("单据编号")
+    private String billNo;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@@ -23,6 +23,8 @@ public enum BillTypeEnum {
     XSDDHT("XSDDHT","销售订单合同"),
     XSDD("XSDD","销售订单"),
     SKD("SKD","款项确认"),
+    GCRK("GCRK","挂车入库"),
+    SZRK("SZRK","上装入库"),
     ;
 
     private String billType;

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

@@ -86,4 +86,6 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
     BaseTrailerDetailsVo fetchByVehSid(String sid);
 
     String selectNum(String billNo);
+
+    int selectNumGCRK(String bill);
 }

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

@@ -63,4 +63,10 @@
         order by billNo desc
                 limit 1
     </select>
+
+    <select id="selectNumGCRK" resultType="int">
+        SELECT IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) CODE
+        from base_trailer
+        where billNo LIKE concat(#{bill}, '%')
+    </select>
 </mapper>

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

@@ -36,6 +36,7 @@ import com.yxt.anrui.base.api.basetrailer.*;
 import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
 import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
@@ -57,8 +58,10 @@ import com.yxt.anrui.base.biz.basevehicleout.BaseVehicleOutService;
 import com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyService;
 import com.yxt.anrui.base.biz.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
+import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
@@ -70,6 +73,13 @@ import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo;
+import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto;
+import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign;
+import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -129,6 +139,12 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
     private BaseVehicleOutService baseVehicleOutService;
     @Autowired
     private BaseVehicleOutApplyService baseVehicleOutApplyService;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private ScmApplyInboundQueryFeign scmApplyInboundQueryFeign;
 
     private QueryWrapper<BaseTrailer> createQueryWrapper(BaseTrailerQuery query) {
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -247,6 +263,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         ResultBean rb = ResultBean.fireFail();
         BaseTrailer baseTrailer = new BaseTrailer();
         dto.fillEntity(baseTrailer);
+        baseTrailer.setCreateBySid(dto.getUserSid());
         //厂商结算价
         String settlementPrice = dto.getSettlementPrice();
         if (StringUtils.isNotBlank(settlementPrice)) {
@@ -259,6 +276,8 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
             BigDecimal decimal = new BigDecimal(dealPrice);
             baseTrailer.setDealPrice(decimal);
         }
+        String billNo = getGCRKApplyCode(dto.getUserSid());
+        baseTrailer.setBillNo(billNo);
         boolean isSave = save(baseTrailer);
         if (!isSave) {
             return rb.setMsg("保存失败");
@@ -285,7 +304,10 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
             certificatePic.setAttachType("挂车合格证照片");
             commonAppendixService.saveOrUpdateDto(certificatePic);
         }
-        StkInStock stkInStock = new StkInStock();
+        String cgrkdSid = pushGCRKInBoundQuery(baseTrailer);
+        scmApplyInboundQueryFeign.ctcgykd(cgrkdSid);
+        /*StkInStock stkInStock = new StkInStock();
+        stkInStock.setFBillNo(billNo);
         //入库日期:FDate  (必填项)
         stkInStock.setFDate(DateUtil.formatDate(new Date()));
         String vehSid = dto.getVehSid();
@@ -329,10 +351,81 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
             finKingDeeFeign.draftStkInStock(stkInStock);
         } catch (Exception e) {
             e.printStackTrace();
-        }
+        }*/
         return rb.success().setMsg("保存成功");
     }
 
+    public String getGCRKApplyCode(String userSid) {
+        //获取分公司sid
+        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
+        String orgCode = resultBean1.getData().getOrgCode();
+        BillNo b = new BillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType(BillTypeEnum.GCRK.getBillType());
+        String bill = Rule.getBill(b);
+        int i = baseMapper.selectNumGCRK(bill);
+        String billNo = Rule.getBillNo(bill, i);
+        return billNo;
+    }
+
+    /*
+     * 挂车入库推送业务采购入库单查询
+     * */
+    private String pushGCRKInBoundQuery(BaseTrailer baseTrailer) {
+        //推送车辆入库查询
+        String vehSid = baseTrailer.getVehSid();
+        //查询主车信息
+        BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid);
+        //查询挂车车型信息
+        BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(baseTrailer.getTrailerModelSid());
+        ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto();
+        //挂车入库日期
+        scmApplyInboundQueryDto.setOrgPriceDate(baseTrailer.getWarehousingDate());
+        //挂车采购类型
+        scmApplyInboundQueryDto.setManPurOrderTypeKey("002");
+        scmApplyInboundQueryDto.setManPurOrderTypeValue("外采");
+        //挂车入库编号
+        scmApplyInboundQueryDto.setApplicationCode(baseTrailer.getBillNo());
+        //挂车采购系统
+        scmApplyInboundQueryDto.setOrgDeptSid(baseVehicle.getPurchaseSystemSid());
+        SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(baseVehicle.getPurchaseSystemSid()).getData();
+        scmApplyInboundQueryDto.setOrgDeptName(sysOrganizationVoBM.getName());
+        scmApplyInboundQueryDto.setPurchaseSystemCode(sysOrganizationVoBM.getOrgCode());
+        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+        scmApplyInboundQueryDto.setPurchaseSystemName(basePurchaseSystemDetailsVo.getPurchaseSystemName());
+        scmApplyInboundQueryDto.setOrgCode(basePurchaseSystemDetailsVo.getOrgCode());
+        //挂车供应商
+        scmApplyInboundQueryDto.setManSid(baseTrailerModel.getManufacturerSid());
+        scmApplyInboundQueryDto.setManName(baseTrailerModel.getManufacturerName());
+        BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseTrailerModel.getManufacturerSid());
+        scmApplyInboundQueryDto.setManCode(baseManufacturer.getManufacturerCode());
+        //挂车制单人
+        scmApplyInboundQueryDto.setMakeListSid(baseTrailer.getCreateBySid());
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(baseTrailer.getCreateBySid()).getData();
+        scmApplyInboundQueryDto.setMakeListName(sysUserVo.getName());
+        scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date()));
+        scmApplyInboundQueryDto.setCreateOrgSid(baseTrailer.getUseOrgSid());
+        scmApplyInboundQueryDto.setCreateOrgName(baseTrailer.getUseOrgName());
+        scmApplyInboundQueryDto.setDownNum("0");
+        List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>();
+        ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto();
+        scmApplyInboundVehQueryDto.setVinNo(baseTrailer.getVinNo().substring(baseTrailer.getVinNo().length() - 8) + "G");
+        scmApplyInboundVehQueryDto.setMgroupCode("99.02");
+        scmApplyInboundVehQueryDto.setMgroupName("挂车");
+        scmApplyInboundVehQueryDto.setVehicleTypeKey("61");
+        scmApplyInboundVehQueryDto.setVehicleTypeValue("外采挂车");
+        scmApplyInboundVehQueryDto.setIunit("辆");
+        scmApplyInboundVehQueryDto.setNum("1");
+        scmApplyInboundVehQueryDto.setSettleMoney(baseTrailer.getSettlementPrice().toString());
+        scmApplyInboundVehQueryDto.setLocalName("在途仓库");
+        scmApplyInboundVehQueryDto.setLocalCode("ARZTCK");
+        scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto);
+        scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys);
+        String sid = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto).getData();
+        return sid;
+    }
+
     public ResultBean updateTrailer(BaseTrailerDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
         int count = updateBySid(dto, sid);

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

@@ -70,4 +70,6 @@ public interface BaseVehinstallMapper extends BaseMapper<BaseVehinstall> {
     BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);
 
     BaseVehinstall seletByVinAndUseOrg(@Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid);
+
+    int selectNumGCRK(String bill);
 }

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

@@ -1,42 +1,60 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo">
-		SELECT
-		bv.sid,
-		bvm.vehicleTypeValue,
-		bvm.installNameValue,
-		bvm.refitMethodValue,
-		bvm.refitFactory,
-		bvm.colorValue,
-		bvm.`plateMaterialValue`,
-		bv.`brandName`,
-		bv.noticeModel,
-		bv.vehModel,
-		bv.vinNo,
-		bv.vehicleStateValue,
-		bv.priceDate,
-		bv.salesDate,
-		bv.costPrice,
-		bv.guidePrice,
-		bv.vehModelSid
-		FROM
-		base_vehinstall bv
-		LEFT JOIN base_vehinstallmodel bvm
-		ON bv.`mainSid` = bvm.`sid`  <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo">
-		SELECT * FROM base_vehinstall <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo">
+        SELECT
+        bv.sid,
+        bvm.vehicleTypeValue,
+        bvm.installNameValue,
+        bvm.refitMethodValue,
+        bvm.refitFactory,
+        bvm.colorValue,
+        bvm.`plateMaterialValue`,
+        bv.`brandName`,
+        bv.noticeModel,
+        bv.vehModel,
+        bv.vinNo,
+        bv.vehicleStateValue,
+        bv.priceDate,
+        bv.salesDate,
+        bv.costPrice,
+        bv.guidePrice,
+        bv.vehModelSid
+        FROM
+        base_vehinstall bv
+        LEFT JOIN base_vehinstallmodel bvm
+        ON bv.`mainSid` = bvm.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo">
+        SELECT * FROM base_vehinstall
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectByOrgSidAndVin" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstall">
+        select *
+        from base_vehinstall
+        where useOrgSid = #{useOrgSid}
+          and vinNo = #{vinNo}
+    </select>
 
-	<select id="selectByOrgSidAndVin" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstall">
-		select * from base_vehinstall where useOrgSid = #{useOrgSid} and vinNo = #{vinNo}
+    <select id="seletByVinAndUseOrg" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstall">
+        select *
+        from base_vehinstall
+        where vinNo = #{vinNo}
+          and useOrgSid = #{useOrgSid}
     </select>
 
-	<select id="seletByVinAndUseOrg" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstall">
-		select * from base_vehinstall where vinNo = #{vinNo} and useOrgSid = #{useOrgSid}
+    <select id="selectNumGCRK" resultType="int">
+        SELECT IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) CODE
+        from base_vehinstall
+        where billNo LIKE concat(#{bill}, '%')
     </select>
 </mapper>

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

@@ -28,6 +28,8 @@ package com.yxt.anrui.base.biz.basevehinstall;
 import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basetrailer.BaseTrailer;
+import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehinstall.*;
 import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
@@ -35,11 +37,20 @@ import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService;
+import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto;
+import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign;
+import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -86,6 +97,12 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
     private BasePurchaseSystemService basePurchaseSystemService;
     @Autowired
     private BaseVehicleService baseVehicleService;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private ScmApplyInboundQueryFeign scmApplyInboundQueryFeign;
 
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
@@ -123,9 +140,14 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
         dto.setVehicleStateKey(VehicleState.StockEnum.STOCK.getCode());
         dto.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
         dto.setPriceDate(DateUtil.formatDate(new Date()));
+        String billNo = getGCRKApplyCode(dto.getUserSid());
+        dto.setBillNo(billNo);
         baseVehinstallService.saveOrUpdateDto(dto);
         if (StringUtils.isBlank(dto.getSid())) {
-            StkInStock stkInStock = new StkInStock();
+            String cgrkdSid = pushSZRKInBoundQuery(dto);
+            scmApplyInboundQueryFeign.ctcgykd(cgrkdSid);
+            /*StkInStock stkInStock = new StkInStock();
+            stkInStock.setFBillNo(billNo);
             //入库日期:FDate  (必填项)
             stkInStock.setFDate(DateUtil.formatDate(new Date()));
             //获取主车信息
@@ -171,11 +193,81 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
                 finKingDeeFeign.draftStkInStock(stkInStock);
             } catch (Exception e) {
                 e.printStackTrace();
-            }
+            }*/
         }
         return rb.success();
     }
 
+    /*
+     * 上装入库推送业务采购入库单查询
+     * */
+    private String pushSZRKInBoundQuery(BaseVehinstallDto dto) {
+        //查询主车信息
+        BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(dto.getVinNo(),dto.getCreateOrg());
+        //查询上装车型信息
+        BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(dto.getMainSid());
+        ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto();
+        //上装入库日期
+        scmApplyInboundQueryDto.setOrgPriceDate(dto.getPriceDate());
+        //上装采购类型
+        scmApplyInboundQueryDto.setManPurOrderTypeKey("002");
+        scmApplyInboundQueryDto.setManPurOrderTypeValue("外采");
+        //上装入库编号
+        scmApplyInboundQueryDto.setApplicationCode(dto.getBillNo());
+        //上装采购系统
+        scmApplyInboundQueryDto.setOrgDeptSid(baseVehicle.getPurchaseSystemSid());
+        SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(baseVehicle.getPurchaseSystemSid()).getData();
+        scmApplyInboundQueryDto.setOrgDeptName(sysOrganizationVoBM.getName());
+        scmApplyInboundQueryDto.setPurchaseSystemCode(sysOrganizationVoBM.getOrgCode());
+        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+        scmApplyInboundQueryDto.setPurchaseSystemName(basePurchaseSystemDetailsVo.getPurchaseSystemName());
+        scmApplyInboundQueryDto.setOrgCode(basePurchaseSystemDetailsVo.getOrgCode());
+        //上装供应商
+        scmApplyInboundQueryDto.setManSid(baseVehinstallmodel.getRefitFactorySid());
+        scmApplyInboundQueryDto.setManName(baseVehinstallmodel.getRefitFactory());
+        BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseVehinstallmodel.getRefitFactorySid());
+        scmApplyInboundQueryDto.setManCode(baseManufacturer.getManufacturerCode());
+        //上装制单人
+        scmApplyInboundQueryDto.setMakeListSid(dto.getUserSid());
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
+        scmApplyInboundQueryDto.setMakeListName(sysUserVo.getName());
+        scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date()));
+        scmApplyInboundQueryDto.setCreateOrgSid(dto.getCreateOrg());
+        String name = sysOrganizationFeign.fetchBySid(dto.getCreateOrg()).getData().getName();
+        scmApplyInboundQueryDto.setCreateOrgName(name);
+        scmApplyInboundQueryDto.setDownNum("0");
+        List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>();
+        ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto();
+        scmApplyInboundVehQueryDto.setVinNo(dto.getVinNo().substring(dto.getVinNo().length() - 8) + "SZ");
+        scmApplyInboundVehQueryDto.setMgroupCode("99.02");
+        scmApplyInboundVehQueryDto.setMgroupName("挂车");
+        scmApplyInboundVehQueryDto.setVehicleTypeKey("61");
+        scmApplyInboundVehQueryDto.setVehicleTypeValue("外采挂车");
+        scmApplyInboundVehQueryDto.setIunit("辆");
+        scmApplyInboundVehQueryDto.setNum("1");
+        scmApplyInboundVehQueryDto.setSettleMoney(dto.getCostPrice());
+        scmApplyInboundVehQueryDto.setLocalName("在途仓库");
+        scmApplyInboundVehQueryDto.setLocalCode("ARZTCK");
+        scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto);
+        scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys);
+        String sid = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto).getData();
+        return sid;
+    }
+
+    public String getGCRKApplyCode(String userSid) {
+        //获取分公司sid
+        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
+        String orgCode = resultBean1.getData().getOrgCode();
+        BillNo b = new BillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType(BillTypeEnum.SZRK.getBillType());
+        String bill = Rule.getBill(b);
+        int i = baseVehinstallService.selectNumGCRK(bill);
+        String billNo = Rule.getBillNo(bill, i);
+        return billNo;
+    }
+
     @Override
     @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")

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

@@ -224,4 +224,8 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
 		BaseVehinstall baseVehinstall = baseMapper.seletByVinAndUseOrg(vinNo,useOrgSid);
 		return rb.success().setData(baseVehinstall);
 	}
+
+	public int selectNumGCRK(String bill) {
+		return baseMapper.selectNumGCRK(bill);
+	}
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java

@@ -18,9 +18,9 @@ public class StkInStock {
     /**
      * 单据编号:FBillNo  (必填项)
      */
-    /*@JsonProperty("FBillNo")
+    @JsonProperty("FBillNo")
     @NotBlank(message = "FBillNo不能为空")
-    public String FBillNo;*/
+    public String FBillNo;
     /**
      *  //分配目标组织:TOrgId  (必填项)
      */@JsonProperty("TOrgId")

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

@@ -3,6 +3,7 @@
   "FBillTypeID": {
     "FNUMBER": "RKD01_SYS"
   },
+  "FBillNo": "@KD_FBillNo",
   "FDate": "@KD_FDate",
   "FStockOrgId": {
     "FNumber": "@KD_FPurchaseOrgId"

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java

@@ -260,7 +260,7 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
         List<ScmApplyInboundVehQueryDetailsVo> scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(cgrkdSid);
         try {
             StkInStock stkInStock = new StkInStock();
-            //stkInStock.setFBillNo(scmApplyInboundQuery.getApplicationCode());
+            stkInStock.setFBillNo(scmApplyInboundQuery.getApplicationCode());
             //获取查询中财务分公司编码
             String orgCode = scmApplyInboundQuery.getOrgCode();
             stkInStock.setFPurchaseOrgId(orgCode);