Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -211,7 +211,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (StringUtils.isBlank(dto.getSid())) { // 新增
             ScmApplyInbound inboundVehicle = new ScmApplyInbound();
             BeanUtil.copyProperties(dto, inboundVehicle);
-            String billNo = getApplyCode(dto.getUserSid());
+            String billNo = getRZSQApplyCode(dto.getUserSid());
             inboundVehicle.setApplicationCode(billNo);
             inboundVehicle.setSid(UUID.randomUUID().toString());
             inboundVehicle.setOrgSidPath(orgPath);
@@ -403,8 +403,6 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                     scmApplyInboundVehicleService.deleteBySid(scmApplyInboundVehicleDto.getSid());
                     BeanUtil.copyProperties(scmApplyInbound, scmApplyInboundDto);
                     scmApplyInboundDto.setSid(null);
-                    String billNo = getApplyCode(dto.getUserSid());
-                    scmApplyInboundDto.setApplicationCode(billNo);
                     scmApplyInboundVehicleDtos1.add(scmApplyInboundVehicleDto);
                 }
             }
@@ -510,6 +508,20 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         return billNo;
     }
 
+    public String getRZSQApplyCode(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.RZSQ.getBillType());
+        String bill = Rule.getBill(b);
+        int i = baseMapper.selectNum(bill);
+        String billNo = Rule.getBillNo(bill, i);
+        return billNo;
+    }
+
     /**
      * 办理
      *