Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java

@@ -34,9 +34,9 @@ public class BaseVehicleModelDto implements Dto {
     @ApiModelProperty(value = "车型sid")
     private String sid;
 
-    @ApiModelProperty(value = "厂商(陕汽必须的字段)", required = true)
+    /*@ApiModelProperty(value = "厂商(陕汽必须的字段)", required = true)
     @NotBlank(message = "厂商不能为空")
-    private String manufacturer;
+    private String manufacturer;*/
 
     @ApiModelProperty(value = "品牌(陕汽必须的字段)", required = true)
     @NotBlank(message = "品牌不能为空")
@@ -53,14 +53,14 @@ public class BaseVehicleModelDto implements Dto {
 //    @NotBlank(message = "车型代号不能为空")
 //    private String vehicleTypeCodeNum;
 
+    @ApiModelProperty(value = "车型编码", required = true)
+    @NotBlank(message = "车型编码不能为空")
+    private String vehicleTypeCode;
+
     @ApiModelProperty(value = "车型名称（产品名称）(陕汽必须的字段)", required = true)
     @NotBlank(message = "车型名称不能为空")
     private String modelName;
 
-    @ApiModelProperty(value = "车型型号(陕汽必须的字段)", required = true)
-    @NotBlank(message = "车型型号不能为空")
-    private String carModel;
-
     @ApiModelProperty(value = "产品线(陕汽必须的字段)", required = true)
     @NotBlank(message = "产品线不能为空")
     private String productLine;
@@ -100,11 +100,6 @@ public class BaseVehicleModelDto implements Dto {
 
     @ApiModelProperty(value = "发动机型号value值")
     private String engineTypeValue;
-
-    @ApiModelProperty("系列")
-    private String series;
-    @ApiModelProperty("系列value值")
-    private String seriesValue;
 /*    @ApiModelProperty(value = "悬架")
     private String suspension;
     @ApiModelProperty(value = "悬架")
@@ -150,6 +145,9 @@ public class BaseVehicleModelDto implements Dto {
     @ApiModelProperty(value = "系别（欧曼特有）")
     private String department;
 
+    @ApiModelProperty(value = "系别Value（欧曼特有）")
+    private String departmentValue;
+
     @ApiModelProperty(value = "是否常用车型")
     private Integer isCommonModel;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelSelectVo.java

@@ -6,6 +6,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -31,8 +32,6 @@ public class BaseVehicleModelSelectVo implements Vo {
     private String vehicleTypeValue;
     @ApiModelProperty(value = "车型名称")
     private String modelName;
-    @ApiModelProperty(value = "车型型号")
-    private String carModel;
     @ApiModelProperty(value = "产品线")
     private String productLine;
     @ApiModelProperty(value = "产品线value值")
@@ -65,10 +64,6 @@ public class BaseVehicleModelSelectVo implements Vo {
     private String engineType;
     @ApiModelProperty(value = "发动机型号value")
     private String engineTypeValue;
-    @ApiModelProperty("系列key")
-    private String series;
-    @ApiModelProperty("系列value")
-    private String seriesValue;
 /*    @ApiModelProperty(value = "悬架key")
     private String suspension;
     @ApiModelProperty(value = "悬架value值")
@@ -114,12 +109,18 @@ public class BaseVehicleModelSelectVo implements Vo {
     @ApiModelProperty(value = "系别（欧曼特有）")
     private String department;
 
+    @ApiModelProperty(value = "系别value")
+    private String departmentValue;
+
     @ApiModelProperty(value = "是否常用车型")
     private Integer isCommonModel;
 
     @ApiModelProperty("是否可以删除（1是，0否）")
     private Integer isDel;
 
-    @ApiModelProperty("是否可以删除（1是，0否）")
+    @ApiModelProperty(value = "车型编码")
+    private String vehicleTypeCode;
+
+    @ApiModelProperty("车型图片")
     private List<BaseVehicleModelAppendixVo> baseVehicleModelAppendixVos;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
  * File: BaseVehicleModelVo.java <br/>
@@ -46,4 +48,6 @@ public class BaseVehicleModelVo implements Vo {
     private String fuelType;
     @ApiModelProperty(value = "车辆版本")
     private String vehicleVersion;
+    @ApiModelProperty(value = "车型图片")
+    private List<String> vehicleModelUrls;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java

@@ -61,6 +61,8 @@ public class BaseVehmodelConfigVo implements Vo {
     private String configurationItemsSid; // 简述配置sid
 	@ApiModelProperty("简述配置名称")
 	private String configName; // 简述配置名称
+	@ApiModelProperty("更多配置")
+	private String otherConfig; // 更多配置
 	@ApiModelProperty("厂家结算价")
     private String manufactorSettlementPrice; // 厂家结算价
 	@ApiModelProperty("销售参考价")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java

@@ -38,6 +38,8 @@ public class CommonContractVo implements Vo {
     private String contractNo;
     @ApiModelProperty("合同类型key")
     private String contractTypeKey;
+    @ApiModelProperty("合同类型")
+    private String contractType;
     @ApiModelProperty("经办人")
     private String staffName;
     @ApiModelProperty("甲方名称")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java

@@ -10,7 +10,7 @@ public enum ContractTemplateEnum {
 
     CARSALECONTRACTNEW("car_sale_contract_new", "新车买卖合同（现车）"),
     CARSALECONTRACTNEWBLANK("car_sale_contract_new_blank", "新车买卖合同（现车）（空）"), // 空白
-    CARSALECONTRACTBOOK("car_sale_contract_book", "新车买卖合同（订车）"),
+    CARSALECONTRACTBOOK("car_sale_contract_book", "新车买卖合同(订车)"),
     CARSALECONTRACTBOOKBLANK("car_sale_contract_book_blank", "新车买卖合同（订车）（空）"), // 空白
     CUSTOMERINVOICINGAPPLICATION("customer_invoicing_application", "客户开票申请书"),
     VEHICLEREGISTRATION("vehicle_registration", "车辆登记合同"),

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

@@ -261,4 +261,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     IPage<BaseVehicleReturnVo> vehicleReturnPageList(IPage<BaseVehicleReturnVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
     ResultBean updateByVinNo(@Param("vinNoList") List<String> stringList, @Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue);
+
+    List<Boolean> selectStateByVinNo(@Param("vinNoList") List<String> vinNoList);
 }

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

@@ -588,4 +588,12 @@
             #{vinNo}
         </foreach>
     </update>
+
+    <select id="selectStateByVinNo" resultType="java.lang.Boolean">
+        select if(vehicleState = '0006','true','false')
+        from base_vehicle where vinNo in
+        <foreach item="vinNo" collection="vinNoList" open="(" separator="," close=")">
+            #{vinNo}
+        </foreach>
+    </select>
 </mapper>

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

@@ -310,7 +310,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
 
     @Override
     public ResultBean<Boolean> selectStateByVinNo(List<String> vinNoList) {
-        return null;
+        return baseVehicleService.selectStateByVinNo(vinNoList);
     }
 
     /**

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

@@ -975,4 +975,15 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         String vehicleStateValue = baseVehicleUpdateQuery.getVihicleStateValue();
         return baseMapper.updateByVinNo(stringList, vehicleState, vehicleStateValue);
     }
+
+    public ResultBean<Boolean> selectStateByVinNo(List<String> vinNoList) {
+        ResultBean<Boolean> resultBean = ResultBean.fireFail();
+        boolean isTrue = false;
+        //查询车架号数组中是否有采购退库状态的车辆，若有则返回true，没有返回false
+        List<Boolean> booleanList = baseMapper.selectStateByVinNo(vinNoList);
+        if (booleanList.contains(true)) {
+            isTrue = true;
+        }
+        return resultBean.success().setData(isTrue);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@@ -62,9 +62,6 @@
         -- <!--发动机型号-->
         bvm.engineType,
         bvm.engineTypeValue,
-        -- <!--系别-->
-        bvm.series,
-        bvm.seriesValue,
         -- <!--创建组织(陕汽必须的字段)-->
         bvm.createOrg,
         -- <!--使用组织sid-->
@@ -76,8 +73,11 @@
         bvm.specifications,
         -- <!--内部编码（欧曼特有）-->
         bvm.insideCode,
+        -- <!--车型编码-->
+        bvm.vehicleTypeCode,
         -- <!--系别（欧曼特有）-->
         bvm.department,
+        bvm.departmentValue,
         -- <!--是否可以删除（1是0否）-->
         bvm.isDel
         FROM base_vehicle_model bvm
@@ -270,9 +270,6 @@
         <!--发动机型号-->
         bvm.engineType,
         bvm.engineTypeValue,
-        <!--系别-->
-        bvm.series,
-        bvm.seriesValue,
         <!--创建组织(陕汽必须的字段)-->
         bvm.createOrg,
         <!--使用组织sid-->
@@ -286,6 +283,9 @@
         bvm.insideCode,
         <!--系别（欧曼特有）-->
         bvm.department,
+        bvm.departmentValue,
+        <!--车型编码-->
+        bvm.vehicleTypeCode,
         <!--是否可以删除（1是0否）-->
         bvm.isDel
         FROM base_vehicle_model bvm

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclemodel.*;
+import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo;
 import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
+import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -22,10 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -45,6 +45,12 @@ import java.util.Map;
 @RequestMapping("v1/basevehiclemodel")
 public class BaseVehicleModelRest implements BaseVehicleModelFeign {
 
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
+    @Autowired
+    private BaseVehicleModelAppendixService baseVehicleModelAppendixService;
+
     @Autowired
     private BaseVehicleModelService baseVehicleModelService;
 
@@ -64,6 +70,20 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
     public ResultBean<PagerVo<BaseVehicleModelVo>> pagerList(@RequestBody PagerQuery<BaseVehicleModelQuery> pagerQuery) {
         ResultBean<PagerVo<BaseVehicleModelVo>> rb = ResultBean.fireFail();
         IPage<BaseVehicleModelVo> page = baseVehicleModelService.pagerList(pagerQuery);
+        List<BaseVehicleModelVo> records = page.getRecords();
+        List<String> strings = new ArrayList<>();
+        for (BaseVehicleModelVo record : records) {
+            String sid = record.getSid();
+            String path = "";
+            List<BaseVehicleModelAppendixVo> baseVehicleModelAppendixVos = baseVehicleModelAppendixService.fetchByVehModelSid(sid);
+            for (BaseVehicleModelAppendixVo baseVehicleModelAppendixVo : baseVehicleModelAppendixVos) {
+                String filePath = baseVehicleModelAppendixVo.getFilePath();
+                String urlPrefix = fileUploadComponent.getUrlPrefix();
+                path = urlPrefix + filePath;
+                strings.add(path);
+            }
+            record.setVehicleModelUrls(strings);
+        }
         PagerVo<BaseVehicleModelVo> pv = new PagerVo<>();
         PagerVo<BaseVehicleModelVo> pv1 = PagerUtil.pageToVo(page, pv);
         return rb.success().setData(pv1);

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

@@ -142,11 +142,13 @@
     <select id="getBySid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig">
         SELECT bvm.`modelName`,
                bmc.`configName`,
+               bmc.`otherConfig`,
                bvc.`manufactorSettlementPrice`,
                bvc.`guidedPrice`
         FROM base_vehmodel_config bvc
                  LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
                  LEFT JOIN base_model_config bmc ON bvc.`configurationItemsSid` = bmc.`sid`
+        WHERE bvc.sid = #{sid}
     </select>
 
     <select id="getAppIntentionVehicleVo"

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

@@ -97,7 +97,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         QueryWrapper<BaseVehmodelConfig> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotBlank(query.getModelSid())) {
-            qw.eq("bvm.sid", query.getModelSid());
+            qw.eq("bvc.modelSid", query.getModelSid());
         }
         if (StringUtils.isNotBlank(query.getUseOrgSid())) {
             qw.eq("bvm.useOrgSid", query.getUseOrgSid());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -581,7 +581,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     public ResultBean<List<PrintConfirmVo>> printConfirm(PrintConfirmDto dto) {
         Map<String, Object> map = new HashMap<String, Object>();
         // 合同信息
-        CommonContract contract = fetchBySid(dto.getSid());
+        CommonContract contract = new CommonContract();//fetchBySid(dto.getSid());
         map.put("partyA", contract.getPartyA()); // 甲方
         map.put("partyB", contract.getPartyB()); // 乙方
         map.put("contractNo", contract.getContractNo()); // 合同编号

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@@ -96,14 +96,14 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             }
         } else {
             //编辑
-            //验证数据是否可更改
-            if (checkCouldChange(sid)) {
-                return rb.setMsg("该条信息不可更改");
-            }
             ScmVehicleReturn scmVehicleReturn = fetchBySid(sid);
             if (scmVehicleReturn == null) {
                 return rb.setMsg("该申请不存在");
             }
+            //验证数据是否可更改
+            if (checkCouldChange(sid)) {
+                return rb.setMsg("该条信息不可更改");
+            }
             if (scmVehicleReturnDto.getDetailsList().size() == 0) {
                 return rb.setMsg("请选择需要退库的车辆");
             }
@@ -191,6 +191,17 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         ResultBean resultBean = saveOrUpdateVehicleReturn(scmVehicleReturnDto);
         if (resultBean.getSuccess()) {
             String businessSid = resultBean.getData().toString();
+            //判断车辆的状态是否包含采购退库的状态，如果是的话，返回审核失败
+            ResultBean<List<String>> vinNoList1 = scmVehicleReturnDetailsService.selectVinNoList(businessSid);
+            if (vinNoList1.getSuccess() && vinNoList1.getData() != null && vinNoList1.getData().size() != 0) {
+                //查询车架号数组中是否有采购退库状态的车辆，若有则返回true，没有返回false
+                ResultBean<Boolean> stringResultBean = baseVehicleFeign.selectStateByVinNo(vinNoList1.getData());
+                if (stringResultBean.getSuccess()) {
+                    if (stringResultBean.getData()) {
+                        return rb.setMsg("该申请中包含车辆状态已是采购退库状态的车辆");
+                    }
+                }
+            }
             Map<String, Object> variables = new HashMap<>();
             variables.put("businessSid", businessSid);
             if (Integer.parseInt(scmVehicleReturnDto.getMoney()) > 0) {
@@ -263,6 +274,12 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         if (vinNoList1.getSuccess() && vinNoList1.getData() != null && vinNoList1.getData().size() != 0) {
             //查询车架号数组中是否有采购退库状态的车辆，若有则返回true，没有返回false
             ResultBean<Boolean> stringResultBean = baseVehicleFeign.selectStateByVinNo(vinNoList1.getData());
+            if (stringResultBean.getSuccess()) {
+                if (stringResultBean.getData()) {
+                    return rb.setMsg("该申请中包含车辆状态已是采购退库状态的车辆");
+                }
+            }
+
         }