推送验车检查表数据

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificate.java

@@ -146,4 +146,10 @@ public class BaseVehicleCertificate extends BaseEntity {
 
     @ApiModelProperty("备注（陕汽必须字段）")
     private String remarks;
+
+    @ApiModelProperty("移交状态key")
+    private String transferStateKey;
+
+    @ApiModelProperty("移交状态value")
+    private String transferStateValue;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateQuery.java

@@ -36,4 +36,10 @@ public class BaseVehicleCertificateQuery implements Query {
 
     @ApiModelProperty("合格证状态（陕汽必须字段）")
     private String certificateState;
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+
+    @ApiModelProperty("移交状态key")
+    private String transferStateKey;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateVo.java

@@ -56,6 +56,12 @@ public class BaseVehicleCertificateVo implements Vo {
     @ApiModelProperty("备注")
     private String remarks;
 
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    
+    @ApiModelProperty("移交状态value")
+    private String transferStateValue;
+
     @ApiModelProperty("合格证照片（陕汽必须字段）")
     private List<String> certificatePhoto;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/VehicleOrderListVo.java

@@ -51,4 +51,14 @@ public class VehicleOrderListVo implements Vo {
     private String insideCode;
     @ApiModelProperty(value = "认款日期")
     private String subscriptionDate;
+
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+    @ApiModelProperty(value = "配置sid")
+    private String configSid;
+    @ApiModelProperty(value = "车型与配置关联表")
+    private String vehModelConfigSid;
+    @ApiModelProperty(value = "销售指导价")
+    private String guidedPrice;
+
 }

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

@@ -403,6 +403,8 @@
                bmc.otherConfig,
                bmc.configName,
                bvm.vehicleAlias,
+               bvm.departmentValue,
+               bvm.emissionStandardValue,
                bmc.sid                     as configSid,
                bvm.sid                     as modelSid,
                bvm.carBrand                as brandSid,
@@ -455,6 +457,8 @@
                bmc.otherConfig,
                bmc.configName,
                bvm.vehicleAlias,
+               bvm.departmentValue,
+               bvm.emissionStandardValue,
                bmc.sid                     as configSid,
                bvm.sid                     as modelSid,
                bvm.carBrand                as brandSid,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@@ -52,7 +52,7 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
      */
     private QueryWrapper<BaseVehicleCertificateVo> buildQueryWrapper(BaseVehicleCertificateQuery pagerQuery) {
         QueryWrapper<BaseVehicleCertificateVo> qw = new QueryWrapper<>();
-        qw.eq("bvc.isDelete",0);
+        qw.eq("bvc.isDelete", 0);
         if (pagerQuery != null) {
             if (StringUtils.isNotBlank(pagerQuery.getCertificationNo())) {//合格证编号
                 qw.like("bvc.certificationNo", pagerQuery.getCertificationNo());
@@ -65,6 +65,12 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
             if (StringUtils.isNotBlank(pagerQuery.getCertificateState())) {//合格证状态
                 qw.like("bvc.certificateState", pagerQuery.getCertificateState());
             }
+            if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
+                qw.like("bvc.vinNo", pagerQuery.getVinNo());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getTransferStateKey())) {
+                qw.eq("bvc.transferStateKey", pagerQuery.getTransferStateKey());
+            }
         }
         return qw;
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml

@@ -4,10 +4,11 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.busvehicleorder.VehicleOrderListVo">
-        SELECT bvo.*, bvad.`vehicleName`,bva.applicationCode
+        SELECT bvo.*, bvad.`vehicleName`,bva.applicationCode,bvad.vehicleSid AS modelSid,bvad.configSid,bvc.`sid` AS vehModelConfigSid,bvc.`guidedPrice`
         FROM bus_vehicle_order bvo
         LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid
         LEFT JOIN bus_vehicle_apply bva ON bva.sid = bvo.purchaseRequisitionSid
+        LEFT JOIN base_vehmodel_config bvc ON bvc.`modelSid` = bvad.`vehicleSid` AND bvc.`configurationItemsSid` = bvad.`configSid`
         <where>
             ${ew.sqlSegment}
         </where>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -257,9 +257,10 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
                 scmApplyInbound.setConfigSid(busVehicleApplyDetail.getConfigSid());
                 scmApplyInbound.setNodeState("待提交");
                 scmApplyInbound.setNum(dto.getPlatformNo());
-                String contractPrice = baseMapper.getContractPrice(dto.getPurchaseRequisitionSid());
+                String contractPrice = baseMapper.getContractPrice(dto.getPurchaseApplyMediumModelSid());
                 scmApplyInbound.setContractPrice(new BigDecimal(contractPrice));
                 scmApplyInbound.setCostPrice(new BigDecimal(contractPrice));
+                scmApplyInbound.setInsideCode(busVehicleApplyDetail.getInsideCode());
                 scmApplyInboundFeign.saveOrUpdateApplyInBound(scmApplyInbound);
             }
             return rb.success();

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

@@ -23,6 +23,7 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmapplyinbound.*;
 import com.yxt.anrui.scm.api.scmapplyinbound.flow.GetNodeQuery;
@@ -340,7 +341,12 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
      * @return
      */
     public ResultBean submitRecordApplication(SubmitScmApplyInboundDto dto) {
-        String orgSidPath = dto.getOrgSidPath();
+        //根据用户sid获取staffSid
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+        //用户的组织全路径
+        String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
         String busSid = dto.getSid();
         if (StringUtils.isBlank(busSid)) {
             Map<String, Object> variables = BeanUtil.beanToMap(dto);
@@ -442,24 +448,28 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                     String userSid = bv.getUserSid();
                     ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
                     String data = pathSidByUserSid.getData();
-                    baseVehicleDto.setCreateOrgSid(data);
-                    baseVehicleDto.setUseOrgSid(data);
+                    baseVehicleDto.setCreateOrgSid(booad.getUseOrgSid());
+                    baseVehicleDto.setCreateOrgName(booad.getUseOrgName());
+                    baseVehicleDto.setUseOrgSid(booad.getUseOrgSid());
+                    baseVehicleDto.setUseOrgName(booad.getUseOrgName());
                     baseVehicleDto.setModelConfigSid(booad.getConfigSid());
                     baseVehicleDto.setConfigName(booad.getConfigName());
                     baseVehicleDto.setInsideCode(booad.getInsideCode());
                     baseVehicleDto.setOrderingNo(booad.getPurchaseOrderNo());
                     baseVehicleDto.setSettlementStatus("0");
+                    baseVehicleDto.setSettlementStatusValue("未买断");
                     baseVehicleDto.setLockedState("0");
                     baseVehicleDto.setLockedStateValue("未锁定");
                     baseVehicleDto.setVehicleState("0003");
                     baseVehicleDto.setVehicleStateValue("在途");
                     baseVehicleDto.setManPurOrderTypeKey("001");
                     baseVehicleDto.setManPurOrderTypeValue("排产订单");
-                    baseVehicleDto.setContractPrice(0);//Integer.parseInt(dto.getContractPrice().toString())
-                    baseVehicleDto.setFreight(0);//Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString())
-                    baseVehicleDto.setCostPrice(0);//Integer.parseInt(dto.getCostPrice().toString())
-                    baseVehicleDto.setPriceDate(DateUtil.today());//dto.getPriceDate()
-                    baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate()
+                    baseVehicleDto.setContractPrice(Integer.parseInt(booad.getContractPrice().toString()));
+                    baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().subtract(booad.getSecondaryFreight()).toString()));
+                    baseVehicleDto.setCostPrice(Integer.parseInt(booad.getCostPrice().toString()));
+                    baseVehicleDto.setPriceDate(booad.getPriceDate());
+                    baseVehicleDto.setDepartureDate(booad.getDepartureDate());
+                    baseVehicleDto.setInsideCode(booad.getInsideCode());
                     baseVehicleDtos.add(baseVehicleDto);
                 }
                 baseVehicleFeign.saveAll(baseVehicleDtos);