问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -30,10 +30,12 @@ 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.basemanufactorsubscription.*;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderListDto;
+import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
 import com.yxt.anrui.base.biz.busvehicleapply.BusVehicleApplyService;
 import com.yxt.anrui.base.biz.busvehicleorder.BusVehicleOrderService;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
@@ -90,6 +92,8 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
     private ScmApplyInboundFeign scmApplyInboundFeign;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private BasePurchaseSystemService basePurchaseSystemService;
 
 
    /* public PagerVo<BaseManufactorSubscription> listPage(PagerQuery<BaseManufactorSubscriptionQuery> pq) {
@@ -273,7 +277,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
                     ScmApplyInboundDto scmApplyInbound = new ScmApplyInboundDto();
                     //申请编号规则：单据名称大写首字母+品牌编码+分公司编码+年份+月份+4位顺序号
                     //获取单据名称大写首字母+品牌编码+分公司编码+年份+月份
-                    String billNo = getApplyCode(busVehicleApplyDetailsVo.getCreateOrgSid());
+                    String billNo = getApplyCode(busVehicleApply.getOrgDeptSid());
                     scmApplyInbound.setApplicationCode(billNo);
                     scmApplyInbound.setOrgPriceDate(DateUtil.formatDate(new Date()));
                     scmApplyInbound.setModelSid(vo.getVehicleSid());
@@ -306,10 +310,10 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
         return rb.success().setMsg("操作成功");
     }
 
-    public String getApplyCode(String orgSid) {
+    public String getApplyCode(String orgDeptSid) {
         //获取分公司sid
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
-        String orgCode = resultBean1.getData().getOrgCode();
+        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(orgDeptSid).getData();
+        String orgCode = basePurchaseSystemDetailsVo.getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);
         b.setBillType(BillTypeEnum.RZSQ.getBillType());