问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDetailsVo.java

@@ -69,18 +69,6 @@ public class BaseManufacturerDetailsVo implements Vo {
     @ApiModelProperty(value = "供应商分组value")
     private String supplierGroupValue;
 
-    @ApiModelProperty("所属分公司sid")
-    private String createOrg;
-
-    @ApiModelProperty(value = "所属分公司名称")
-    private String createOrgName;
-
-    @ApiModelProperty(value = "使用组织sid类型")
-    private String useOrg;
-
-    @ApiModelProperty(value = "使用组织名称")
-    private String useOrgName;
-
     @ApiModelProperty(value = "国家")
     private String country;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java

@@ -97,18 +97,6 @@ public class BaseManufacturerDto implements Dto {
     @ApiModelProperty(value = "供应商分组value值", required = false)
     private String supplierGroupValue;
 
-    @ApiModelProperty("所属分公司sid")
-    private String createOrg;
-
-    @ApiModelProperty(value = "所属分公司名称")
-    private String createOrgName;
-
-    @ApiModelProperty(value = "使用组织sid", required = true)
-    private String useOrg;
-
-    @ApiModelProperty(value = "使用组织名称")
-    private String useOrgName;
-
     @ApiModelProperty(value = "国家", required = false)
     private String country;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java

@@ -38,6 +38,4 @@ public class BaseManufacturerVo implements Vo {
     private String contactMobile;
     @ApiModelProperty(value = "供应商分类Value")
     private String supplierTypeValue;
-    @ApiModelProperty(value = "所属分公司名称")
-    private String createOrgName;
 }

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

@@ -1,11 +1,14 @@
 package com.yxt.anrui.base.api.basevehicle;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
  * File: BaseVehicleVo.java <br/>
@@ -25,31 +28,66 @@ public class BaseVehicleVo implements Vo {
 
     @ApiModelProperty(value = "车辆sid")
     private String sid;
-
-    @ApiModelProperty("车型sid")
-    private String modelSid;
-
-    @ApiModelProperty("车型名称")
-    private String modelName;
-
-    @ApiModelProperty(value = "配置编码")
-    private String vehicleCode;
-
-    @ApiModelProperty("车架号(VIN)")
+    @ApiModelProperty("常用配置名称")
+    private String configName;
+    @ApiModelProperty("车架号(VIN)（陕汽必须的字段）")
     private String vinNo;
-
-    @ApiModelProperty("发动机号/许可证号")
-    private String engineNo;
-
-    @ApiModelProperty("车辆状态")
+    @ApiModelProperty("车辆状态value值")
     private String vehicleStateValue;
-
     @ApiModelProperty("存放地点名称（陕汽必须的字段）")
     private String locationName;
-
-    @ApiModelProperty("车型配置sid")
-    private String modelConfigSid;
-
+    @ApiModelProperty(value = "厂家订单编号")
+    private String orderingNo;
+    @ApiModelProperty(value = "厂家结算价")
+    private Integer costPrice;
+    @ApiModelProperty(value = "运费")
+    private Integer freight;
+    @ApiModelProperty(value = "厂家合同价")
+    private Integer contractPrice;
+    @ApiModelProperty(value = "厂家入库日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date priceDate;
+    @ApiModelProperty(value = "实销日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date solidDate;
+    @ApiModelProperty(value = "成交价")
+    private Integer salePrice;
+    @ApiModelProperty("创建组织名称(陕汽必须的字段)")
+    private String createOrgName;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("发车日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date departureDate;
+    @ApiModelProperty("到货日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date arrivalDate;
+    @ApiModelProperty("销售日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date salesDate;
+    @ApiModelProperty("退库日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date returnDate;
+    @ApiModelProperty("返利1")
+    private String rebate1;
+    @ApiModelProperty("返利2")
+    private String rebate2;
+    @ApiModelProperty("保修卡号")
+    private String warrantyCardNo;
+    @ApiModelProperty("锁定状态Value")
+    private String lockedStateValue;
+    @ApiModelProperty("返利3")
+    private String rebate3;
+    @ApiModelProperty("结算状态 实销 1/买断 2")
+    private String settlementStatus;
+    @ApiModelProperty(value = "厂家采购订单类型value")
+    private String manPurOrderTypeValue;
+    @ApiModelProperty("特殊或差异说明")
+    private String specialInstructions;
+    @ApiModelProperty("内部编码")
+    private String insideCode;
     @ApiModelProperty("销售指导价")
     private String guidedPrice;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -80,9 +80,6 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
             if (StringUtils.isNotBlank(pagerQuery.getSupplierType())) {//厂商分类key
                 qw.eq("bm.supplierType", pagerQuery.getSupplierType());
             }
-            if (StringUtils.isNotBlank(pagerQuery.getUseOrgSid())) {//所属分公司
-                qw.eq("bm.createOrg", pagerQuery.getUseOrgSid());
-            }
             if (StringUtils.isNotBlank(pagerQuery.getManufacturerTelePhone())) {//厂商办公电话
                 qw.like("bm.manufacturerTelePhone", pagerQuery.getManufacturerTelePhone());
             }

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

@@ -12,14 +12,7 @@
     </select>
     <!--分页列表-->
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
-        SELECT bv.sid,
-        bv.modelSid,
-        bv.modelName,
-        bv.vinNo,
-        bv.engineNo,
-        bv.vehicleStateValue,
-        bv.locationName,
-        bv.modelConfigSid,
+        SELECT bv.*,
         bvc.`guidedPrice`
         FROM base_vehicle bv
         LEFT JOIN base_vehmodel_config bvc

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

@@ -117,4 +117,13 @@ public class ScmApplyInbound extends BaseEntity {
     private String taskId;
     @ApiModelProperty("车辆台数")
     private String num;
+    @ApiModelProperty("扣减运费")
+    private String deductionFreight;
+    @ApiModelProperty("计算政策2:扣减政策1")
+    private String deductionPolicyTwoOne;
+    @ApiModelProperty("计算政策3:扣减政策1")
+    private String deductionPolicyThreeOne;
+    @ApiModelProperty("计算政策3:扣减政策2")
+    private String deductionPolicyThreeTwo;
+
 }

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

@@ -131,6 +131,16 @@ public class ScmApplyInboundDto implements Dto {
     private String useOrgSid;
     @ApiModelProperty("分公司名称")
     private String useOrgName;
+    @ApiModelProperty("扣减运费")
+    private String deductionFreight;
+    @ApiModelProperty("计算政策2:扣减政策1")
+    private String deductionPolicyTwoOne;
+    @ApiModelProperty("计算政策3:扣减政策1")
+    private String deductionPolicyThreeOne;
+    @ApiModelProperty("计算政策3:扣减政策2")
+    private String deductionPolicyThreeTwo;
     @ApiModelProperty("车辆列表")
     private List<ScmApplyInboundVehicleDto> vehicleList;
+    @ApiModelProperty("附件信息表")
+    private List<ScmFileDto> scmFiles;
 }

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

@@ -3,6 +3,8 @@ package com.yxt.anrui.scm.api.scmapplyinbound;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
+import com.yxt.anrui.scm.api.scmfile.ScmFileDto;
+import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -125,4 +127,14 @@ public class ScmApplyInboundVo implements Vo {
     @ApiModelProperty("厂家入库日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date priceDate;
+    @ApiModelProperty("扣减运费")
+    private String deductionFreight;
+    @ApiModelProperty("计算政策2:扣减政策1")
+    private String deductionPolicyTwoOne;
+    @ApiModelProperty("计算政策3:扣减政策1")
+    private String deductionPolicyThreeOne;
+    @ApiModelProperty("计算政策3:扣减政策2")
+    private String deductionPolicyThreeTwo;
+    @ApiModelProperty("附件信息表")
+    private List<ScmFileVo> scmFiles;
 }