Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -605,7 +605,7 @@
         AND bv.modelConfigSid = bvc.configurationItemsSid
         and (bv.vehicleStateValue = '库存' or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入')
         AND bv.lockedState = #{lockedStateKey}
-        and bv.useOrgSid = #{orgSid} and bv.isProblemVeh = '0') AS nowCarNum,
+        and bv.useOrgSid = #{orgSid} and bv.isProblemVeh = '0' and length(bv.vinNo)>8) AS nowCarNum,
         (select SUM(cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
         as quantity from bus_vehicle_order bo
         LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseApplyMediumModelSid = bd.sid

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -720,7 +720,7 @@
         OR bv.vehicleStateValue = '在途'
         or bv.vehicleStateValue = '调入')
         AND lockedState = #{lockedStateKey}
-        AND bv.useOrgSid = #{useOrgSid} and bv.isProblemVeh = '0') AS nowCarNum,
+        AND bv.useOrgSid = #{useOrgSid} and bv.isProblemVeh = '0' and length(bv.vinNo)>8) AS nowCarNum,
         (select SUM(cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
         as quantity from bus_vehicle_order bo
         LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseApplyMediumModelSid = bd.sid

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java

@@ -44,7 +44,7 @@ public class AppBusSalesOrderAllDto implements Dto {
     @NotBlank(message = "参数错误：客户sid不能为空")
     private String customerSid;
     @ApiModelProperty("挂靠公司类型 1 选择 0 手写")
-    @NotBlank(message = "参数错误：挂靠公司类型不能为空")
+//    @NotBlank(message = "参数错误：挂靠公司类型不能为空")
     private String affiliatedType;
     @ApiModelProperty("选择挂靠公司名称")
     private String affiliatedOrgNameChoose;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2251,6 +2251,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 return rb.setMsg("开票信息为必选项");
             }
         }
+        if(StringUtils.isNotBlank(dto.getAffiliatedOrgSid())){
+            if("02".equals(dto.getBillingTypeKey())){//增值税
+                CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
+                if(crmCustomerTemp != null){
+                    return rb.setMsg("开票类型与选择的开票信息不符，请检查");
+                }
+            }
+        }
         SysUserVo sysUserInfoVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         //根据客户sid查询客户信息
         ResultBean<AppCrmCustomerTempInfoVo> crmCustomerTempInfoVoResultBean = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(dto.getCustomerSid());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java

@@ -49,7 +49,7 @@ public class BusOrerSalesAllDto implements Dto {
     @NotBlank(message = "参数错误：客户sid不能为空")
     private String customerSid;
     @ApiModelProperty("挂靠公司类型 1 选择 0 手写")
-    @NotBlank(message = "参数错误：挂靠公司类型不能为空")
+//    @NotBlank(message = "参数错误：挂靠公司类型不能为空")
     private String affiliatedType;
     @ApiModelProperty("选择挂靠公司名称")
     private String affiliatedOrgNameChoose;

yxt-as/pom.xml

@@ -11,7 +11,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.yxt</groupId>
+    <groupId>com.yxt.anrui</groupId>
     <artifactId>yxt-as</artifactId>
     <version>0.0.1</version>
 

yxt-as/src/main/java/com/yxt/as/AsApplication.java → yxt-as/src/main/java/com/yxt/anrui/as/AsApplication.java

@@ -1,4 +1,4 @@
-package com.yxt.as;
+package com.yxt.anrui.as;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -11,9 +11,9 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableDiscoveryClient
 @SpringBootApplication(scanBasePackages = {
         "com.yxt.common.base.config",
-        "com.yxt.as"
+        "com.yxt.anrui.as"
 })
-@EnableFeignClients(basePackages = {})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.*",})
 public class AsApplication {
     public static void main(String[] args) {
         SpringApplication.run(AsApplication.class, args);

yxt-as/src/main/java/com/yxt/as/api/Test.java → yxt-as/src/main/java/com/yxt/anrui/as/api/Test.java

@@ -1,4 +1,4 @@
-package com.yxt.as.api;
+package com.yxt.anrui.as.api;
 
 /**
  * @description:

yxt-as/src/main/java/com/yxt/as/biz/TestRest.java → yxt-as/src/main/java/com/yxt/anrui/as/biz/TestRest.java

@@ -1,4 +1,4 @@
-package com.yxt.as.biz;
+package com.yxt.anrui.as.biz;
 
 /**
  * @description:

yxt-as/src/main/java/com/yxt/as/feign/base/basevehicle/BaseVehicleFeign.java → yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basevehicle/BaseVehicleFeign.java

@@ -1,4 +1,4 @@
-package com.yxt.as.feign.base.basevehicle;
+package com.yxt.anrui.as.feign.base.basevehicle;
 
 import org.springframework.cloud.openfeign.FeignClient;
 

yxt-as/src/main/java/com/yxt/as/feign/portal/sysstafforg/SysStaffOrgFeign.java → yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysstafforg/SysStaffOrgFeign.java

@@ -1,4 +1,4 @@
-package com.yxt.as.feign.portal.sysstafforg;
+package com.yxt.anrui.as.feign.portal.sysstafforg;
 
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.ApiOperation;