车型、车辆查询条件修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java

@@ -125,9 +125,9 @@ public class BaseVehicle extends BaseEntity {
     private String settlementStatus;
     @ApiModelProperty("结算状态value")
     private String settlementStatusValue;
-    @ApiModelProperty(value = "厂家采购订单类型key")
+    @ApiModelProperty(value = "采购类型key")
     private String manPurOrderTypeKey;
-    @ApiModelProperty(value = "厂家采购订单类型value")
+    @ApiModelProperty(value = "采购类型value")
     private String manPurOrderTypeValue;
     @ApiModelProperty("特殊或差异说明")
     private String specialInstructions;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml

@@ -1,14 +1,20 @@
 <?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.baseaccadjapply.BaseAccadjApplyMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyVo">
-		SELECT * FROM base_accadj_apply <where> ${ew.sqlSegment} </where>
+        SELECT * FROM base_accadj_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyVo">
-		SELECT * FROM base_accadj_apply <where> ${ew.sqlSegment} </where>
+        SELECT * FROM base_accadj_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="fetchVeh"
@@ -25,7 +31,11 @@
         base_internal_purchase_vehicle bipv
         LEFT JOIN base_internal_purchase bip
         ON bipv.`mainSid` = bip.`sid`
-		<where> ${ew.sqlSegment} </where>
+        LEFT JOIN base_vehicle bv
+        ON bv.`vinNo` = bipv.`vinNo` AND bip.`createOrgSid` = bv.`createOrgSid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <update id="updateFlowFiled">

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -46,6 +46,7 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
 import com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehService;
 import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
 import com.yxt.anrui.base.biz.basemanufactorsubscription.BaseManufactorSubscriptionService;
+import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -227,6 +228,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             qw.notIn("bipv.sid", query.getSids());
         }
         qw.eq("bip.nodeState","已办结");
+        qw.and(wrapper -> wrapper.ne("bv.vehicleState", VehicleState.StockEnum.DH_STOCK.getCode()).or().ne("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()));
         IPage<BaseInternalPurchaseVehicleDetailsVo> page = PagerUtil.queryToPage(pq);
         IPage<BaseInternalPurchaseVehicleDetailsVo> pagging = baseMapper.fetchVeh(page, qw);
         PagerVo<BaseInternalPurchaseVehicleDetailsVo> p = PagerUtil.pageToVo(pagging, null);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.xml

@@ -25,6 +25,8 @@
 		base_internal_purchase_vehicle bipv
 		LEFT JOIN base_internal_purchase bip
 		ON bipv.`mainSid` = bip.`sid`
+		LEFT JOIN base_vehicle bv
+		ON bv.`vinNo` = bipv.`vinNo` AND bip.`createOrgSid` = bv.`createOrgSid`
 		<where> ${ew.sqlSegment} </where>
 	</select>
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java

@@ -43,6 +43,7 @@ import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
 import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
 import com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehService;
 import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
+import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -204,10 +205,12 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
         //qw.eq("bip.shuntingTypeKey", "01");
         qw.eq("bip.buyerOrgSid", callInOrgSid);
         qw.eq("bip.sellerOrgSid", callOutOrgSid);
+        qw.eq("bipv.isInvoicing", 0);
         if (query.getSids().size() > 0) {
             qw.notIn("bipv.sid", query.getSids());
         }
         qw.eq("bip.nodeState", "已办结");
+        qw.and(wrapper -> wrapper.ne("bv.vehicleState", VehicleState.StockEnum.DH_STOCK.getCode()).or().ne("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()));
         IPage<BaseInternalPurchaseVehicleDetailsVo> page = PagerUtil.queryToPage(pq);
         IPage<BaseInternalPurchaseVehicleDetailsVo> pagging = baseMapper.fetchVeh(page, qw);
         PagerVo<BaseInternalPurchaseVehicleDetailsVo> p = PagerUtil.pageToVo(pagging, null);

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

@@ -1296,12 +1296,15 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (params.getVinNoList().size() > 0) {
                 qw.notIn("bv.vinNo", params.getVinNoList());
             }
+            qw.eq("bv.isDelete", 0);
             //锁定状态：未锁定
             qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
             //库存状态：库存
             qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
+            //订单类型
+            qw.ne("bv.manPurOrderTypeKey",ManPurOrderType.ManOrderType.NG_ORDER.getCode());
             //调车状态：未调车
-            qw.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.OUTCOLL.getCode());
+            //qw.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.OUTCOLL.getCode());
         }
         return qw;
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -58,6 +58,8 @@
         ON bvc.modelSid = bvm.sid
         LEFT JOIN base_model_config bmc
         ON bvc.configurationItemsSid = bmc.sid
+        LEFT JOIN base_vehicle_brand bvb
+        ON bvm.carBrand = bvb.sid
         <where>
             ${ew.sqlSegment}
         </where>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -37,6 +37,7 @@ import com.yxt.anrui.base.api.basevehmodelconfig.*;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
+import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -108,6 +109,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         }
         if (StringUtils.isNotBlank(query.getUseOrgSid())) {
             qw.eq("bvc.useOrgSid", query.getUseOrgSid());
+            qw.like("bvb.useOrg", query.getUseOrgSid());
         }
         if (StringUtils.isNotBlank(query.getCarColorKey())) {//车身颜色
             qw.like("bmc.carColorKey", query.getCarColorKey());
@@ -653,21 +655,21 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
             String configSid = record.getConfigSid();
             String modelSid = record.getModelSid();
             QueryWrapper<Object> qwq = new QueryWrapper<>();
-            qwq.eq("bv.isDelete",0);
-            qwq.eq("bv.modelSid",modelSid);
-            qwq.eq("bv.modelConfigSid",configSid);
-            qwq.eq("bv.createOrgSid",query.getUseOrgSid());
+            qwq.eq("bv.isDelete", 0);
+            qwq.eq("bv.modelSid", modelSid);
+            qwq.eq("bv.modelConfigSid", configSid);
+            qwq.eq("bv.createOrgSid", query.getUseOrgSid());
             qwq.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
-            qwq.eq("bv.lockedState",VehicleState.LockEnum.UN_LOCK.getCode());
-            qwq.eq("bv.witPinState",VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState",VehicleState.ShuntingEnum.OUTCOLL.getCode());
+            qwq.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
+            qwq.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.OUTCOLL.getCode());
             int stockNum = baseVehicleService.getStockNum(qwq);
             record.setNum(stockNum);
             BaseVehmodelVo baseVehmodelVo = baseMapper.selectO(modelSid, configSid, query.getBuyerOrgSid());
-            if (baseVehmodelVo != null){
+            if (baseVehmodelVo != null) {
                 String guidedPrice = baseVehmodelVo.getGuidedPrice();
-                if (StringUtils.isBlank(guidedPrice)){
+                if (StringUtils.isBlank(guidedPrice)) {
                     record.setGuidedPrice("0");
-                }else {
+                } else {
                     record.setGuidedPrice(guidedPrice);
                 }
             }
@@ -712,25 +714,28 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
             String configSid = record.getConfigSid();
             String modelSid = record.getModelSid();
             QueryWrapper<Object> qwq = new QueryWrapper<>();
-            qwq.eq("bv.isDelete",0);
-            qwq.eq("bv.modelSid",modelSid);
-            qwq.eq("bv.modelConfigSid",configSid);
-            qwq.eq("bv.createOrgSid",query.getUseOrgSid());
+            qwq.eq("bv.isDelete", 0);
+            qwq.eq("bv.modelSid", modelSid);
+            qwq.eq("bv.modelConfigSid", configSid);
+            qwq.eq("bv.createOrgSid", query.getUseOrgSid());
             qwq.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
-            qwq.eq("bv.lockedState",VehicleState.LockEnum.UN_LOCK.getCode());
-            qwq.and(wrapper -> wrapper.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.OUTCOLL.getCode()));
+            qwq.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
+            //订单类型
+            qwq.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.NG_ORDER.getCode());
+            qwq.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.WC_ORDER.getCode());
+            //qwq.and(wrapper -> wrapper.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.OUTCOLL.getCode()));
             int stockNum = baseVehicleService.getStockNum(qwq);
             record.setNum(stockNum);
             BaseVehmodelVo baseVehmodelVo = baseMapper.selectO(modelSid, configSid, query.getBuyerOrgSid());
-            if (baseVehmodelVo != null){
+            if (baseVehmodelVo != null) {
                 String guidedPrice = baseVehmodelVo.getGuidedPrice();
-                if (StringUtils.isBlank(guidedPrice)){
+                if (StringUtils.isBlank(guidedPrice)) {
                     record.setGuidedPrice("0");
-                }else {
+                } else {
                     record.setGuidedPrice(guidedPrice);
                 }
             }
-            if (stockNum > 0){
+            if (stockNum > 0) {
                 records1.add(record);
             }
         }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java

@@ -125,5 +125,8 @@ public class ScmApplyInbound extends BaseEntity {
     private String deductionPolicyThreeOne;
     @ApiModelProperty("计算政策3:扣减政策2")
     private String deductionPolicyThreeTwo;
-
+    @ApiModelProperty(value = "采购类型key")
+    private String manPurOrderTypeKey;
+    @ApiModelProperty(value = "采购类型value")
+    private String manPurOrderTypeValue;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java

@@ -139,6 +139,10 @@ public class ScmApplyInboundDto implements Dto {
     private String deductionPolicyThreeOne;
     @ApiModelProperty("计算政策3:扣减政策2")
     private String deductionPolicyThreeTwo;
+    @ApiModelProperty(value = "采购类型key")
+    private String manPurOrderTypeKey;
+    @ApiModelProperty(value = "采购类型value")
+    private String manPurOrderTypeValue;
     @ApiModelProperty("车辆列表")
     private List<ScmApplyInboundVehicleDto> vehicleList;
     @ApiModelProperty("附件信息表")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java

@@ -135,6 +135,10 @@ public class ScmApplyInboundVo implements Vo {
     private String deductionPolicyThreeOne;
     @ApiModelProperty("计算政策3:扣减政策2")
     private String deductionPolicyThreeTwo;
+    @ApiModelProperty(value = "采购类型key")
+    private String manPurOrderTypeKey;
+    @ApiModelProperty(value = "采购类型value")
+    private String manPurOrderTypeValue;
     @ApiModelProperty("附件信息表")
     private List<ScmFileVo> scmFiles;
 }

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

@@ -480,6 +480,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                     baseVehicleDto.setPriceDate(booad.getPriceDate());
                     baseVehicleDto.setDepartureDate(booad.getDepartureDate());
                     baseVehicleDto.setInsideCode(booad.getInsideCode());
+                    baseVehicleDto.setManPurOrderTypeKey(booad.getManPurOrderTypeKey());
+                    baseVehicleDto.setManPurOrderTypeValue(booad.getManPurOrderTypeValue());
                     baseVehicleDtos.add(baseVehicleDto);
                 }
                 baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.RZ_SAVEVEH.getCode());