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-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

@@ -166,7 +166,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item>
-              <span slot="label">内部编码：</span>
+              <span slot="label">厂家开票日期：</span>
               <span>{{ temp.manDate }}</span>
             </el-form-item>
           </el-col>

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;

doc/databases/统计报表更新.sql

@@ -283,7 +283,7 @@ BEGIN
      WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();*/
 
     UPDATE daily_report r
-        INNER JOIN (select (b.scount - b.ssscount) as scount, b.useOrgSid, b.modelConfigSid, b.modelSid
+        INNER JOIN (select (b.scount - b.ssscount-b.ssscount1) as scount, b.useOrgSid, b.modelConfigSid, b.modelSid
                     from (SELECT a.scount,
                                  a.useOrgSid,
                                  a.modelConfigSid,
@@ -293,11 +293,23 @@ BEGIN
                                            LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bov ON bov.linkSid = bv.sid
                                            LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bov.salesOrderSid
                                            LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
+                                 left join anrui_base.base_vehicle_state bs on bs.busSid = bov.sid
                                   WHERE bo.nodeState = '已办结'
-                                    AND bv.vehicleState = '0002'
+                                    AND (bv.vehicleState = '0002' or bs.busNo = '602')
                                     and bo.useOrgSid = a.useOrgSid
                                     and bm.modelSid = a.modelSid
-                                    and bm.modelConfigSid = a.modelConfigSid) as ssscount
+                                    and bm.modelConfigSid = a.modelConfigSid) as ssscount,
+                                 (SELECT count(bov.id) AS scount
+                                  FROM anrui_base.base_vehicle bv
+                                           LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bov ON bov.linkSid = bv.sid
+                                           LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bov.salesOrderSid
+                                           LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
+                                           left join anrui_base.base_vehicle_state bs on bs.busSid = bov.sid
+                                  WHERE bo.nodeState = '已办结'
+                                    AND bs.busState = '602'
+                                    and bo.useOrgSid = a.useOrgSid
+                                    and bm.modelSid = a.modelSid
+                                    and bm.modelConfigSid = a.modelConfigSid) as ssscount1
                           FROM (
                                    SELECT count(bov.id) AS scount,
                                           bo.useOrgSid,