Browse Source

问题修改

zhanglei
God 3 years ago
parent
commit
62cfc13fd0
  1. 30
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java
  3. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java
  4. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java
  5. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java
  6. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java
  7. 33
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  8. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml
  9. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  10. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml
  11. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java
  12. 189
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
  13. 8
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java
  14. 1
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
  15. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
  16. 9
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java
  17. 120
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java
  18. 9
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java
  19. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

30
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java

@ -25,8 +25,8 @@ public class BaseModelConfigVo implements Vo {
@ApiModelProperty(value = "常用配置sid")
private String sid;
/* @ApiModelProperty("车型配置代码(陕汽必须的字段)")
private String vehicleCode;*/
/* @ApiModelProperty("车型配置代码(陕汽必须的字段)")
private String vehicleCode;*/
@ApiModelProperty("车身颜色key")
private String carColorKey;
@ApiModelProperty("车身颜色(陕汽必须的字段)")
@ -61,18 +61,18 @@ public class BaseModelConfigVo implements Vo {
private String airConditioner;
@ApiModelProperty("其他配置")
private String otherConfig;
/* @ApiModelProperty("彩色仪表盘(是、否)")
private String isColorPanel;
@ApiModelProperty("基础单位")
private String basedUnit;
@ApiModelProperty("公司指导价(陕汽必须的字段)")
private String companyGuidePrice;*/
/* @ApiModelProperty("彩色仪表盘(是、否)")
private String isColorPanel;
@ApiModelProperty("基础单位")
private String basedUnit;
@ApiModelProperty("公司指导价(陕汽必须的字段)")
private String companyGuidePrice;*/
@ApiModelProperty("后桥速比key")
private String rearAxleRatioKey;
@ApiModelProperty("后桥速比")
private String rearAxleRatio;
/* @ApiModelProperty("委改厂(欧曼)")
private String appointToFactory;*/
/* @ApiModelProperty("委改厂(欧曼)")
private String appointToFactory;*/
@ApiModelProperty("轮胎规格key")
private String tireSizeKey;
@ApiModelProperty("轮胎规格")
@ -134,8 +134,10 @@ public class BaseModelConfigVo implements Vo {
private Integer isUseState;
@ApiModelProperty(value = "销售指导价")
private String guidedPrice;
/* @ApiModelProperty(value = "车型名称")
private String modelName;
@ApiModelProperty(value = "发动机型号")
private String engineTypeValue;*/
/* @ApiModelProperty(value = "车型名称")
private String modelName;
@ApiModelProperty(value = "发动机型号")
private String engineTypeValue;*/
@ApiModelProperty("创建组织名称")
private String createOrg;
}

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

@ -90,9 +90,12 @@ public class BaseVehicleModel extends BaseEntity {
@ApiModelProperty(value = "发动机型号value值")
private String engineTypeValue;
@ApiModelProperty("创建组织(陕汽必须的字段)")
@ApiModelProperty("创建组织")
private String createOrg;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("使用组织(陕汽必须的字段)")
private String useOrg;

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

@ -92,6 +92,9 @@ public class BaseVehicleModelDetailsVo implements Vo {
@ApiModelProperty(value = "创建组织(陕汽必须的字段)")
private String createOrg;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty(value = "使用组织sid:List类型")
private String[][] useOrg;

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

@ -128,6 +128,9 @@ public class BaseVehicleModelDto implements Dto {
@ApiModelProperty(value = "创建组织(陕汽必须的字段)")
private String createOrg;
@ApiModelProperty("创建组织名称")
private String createOrgName;
/* @ApiModelProperty(value = "使用组织id", required = true)
@NotBlank(message = "使用组织不能为空")
private String useOrg;

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

@ -58,6 +58,8 @@ public class BaseVehicleModelVo implements Vo {
private String vehicleAlias;
@ApiModelProperty(value = "排放标准value值")
private String emissionStandardValue;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty(value = "车型图片")
private List<String> vehicleModelUrls;
}

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

@ -26,6 +26,7 @@
package com.yxt.anrui.base.api.basevehmodelconfig;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: anrui-base(车型信息) <br/>
@ -53,6 +55,9 @@ public class BaseVehmodelConfigVo implements Vo {
@ApiModelProperty("车型与简述配置关联sid")
private String sid; // 车型与简述配置关联sid
@ApiModelProperty("最新更新日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date modifyTime; // 最新更新日期
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型别名")

33
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@ -120,12 +120,15 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (bip.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (bip.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getNodeState())) {
//qw.eq("bip.nodeState",query.getNodeState());
}
if (StringUtils.isNotBlank(query.getSellerOrgSid())) {
qw.like("bip.sellerOrgSid", query.getSellerOrgSid());
}
if (StringUtils.isNotBlank(query.getShuntingTypeKey())) {
qw.eq("bip.shuntingTypeKey", query.getShuntingTypeKey());
}
if (StringUtils.isNotBlank(query.getBuyerOrgSid())) {
qw.eq("bip.buyerOrgSid", query.getBuyerOrgSid());
}
IPage<BaseInternalPurchase> page = PagerUtil.queryToPage(pq);
IPage<BaseInternalPurchaseVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseInternalPurchaseVo> p = PagerUtil.pageToVo(pagging, null);
@ -160,9 +163,14 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
String dtoSid = dto.getSid();
List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles();
if (StringUtils.isBlank(dtoSid)) {//新增
String sellerOrgName = dto.getSellerOrgName();
if (StringUtils.isBlank(sellerOrgName)) {
return rb.setMsg("售方机构不能为空");
if (StringUtils.isBlank(dto.getShuntingTypeKey())) {
return rb.setMsg("调车类型不能为空");
}
if (StringUtils.isBlank(dto.getSellerOrgSid())) {
return rb.setMsg("调出分公司不能为空");
}
if (StringUtils.isBlank(dto.getBuyerOrgSid())) {
return rb.setMsg("调入分公司不能为空");
}
BaseInternalPurchase baseInternalPurchase = new BaseInternalPurchase();
String sid = baseInternalPurchase.getSid();
@ -196,6 +204,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
String sid1 = baseInternalPurchaseVehicle1.getSid();
BeanUtil.copyProperties(baseInternalPurchaseVehicle, baseInternalPurchaseVehicle1);
baseInternalPurchaseVehicle1.setSid(sid1);
baseInternalPurchaseVehicle1.setModelSid(baseInternalPurchaseVehicle.getVehicleSid());
baseInternalPurchaseVehicle1.setMainSid(dtoSid);
baseInternalPurchaseVehicleService.save(baseInternalPurchaseVehicle1);
}
@ -340,10 +349,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
if (StringUtils.isBlank(vinNo)) {
return rb.setMsg("请填写车架号");
}
if (StringUtils.isBlank(inventoryLocationSid)){
if (StringUtils.isBlank(inventoryLocationSid)) {
return rb.setMsg("请选择存放地点");
}
baseInternalPurchaseVehicleService.updateVinNoBySid(sid, vinNo,inventoryLocationSid,inventoryLocationName);
baseInternalPurchaseVehicleService.updateVinNoBySid(sid, vinNo, inventoryLocationSid, inventoryLocationName);
}
}
if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
@ -372,14 +381,14 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
userQuery.setRoleSid(candidateGroups.get(0));
userQuery.setOrgSidPath("11/11/" + callOutOrgSid + "/11");
List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
StringBuilder nextNodeUserSids =new StringBuilder();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {
String sid = sysUserVo.getSid();
nextNodeUserSids.append(sid).append(",");
}
}
String substring = nextNodeUserSids.substring(0,nextNodeUserSids.lastIndexOf(","));
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
}
if (shuntingTypeValue.equals("调出")) {
@ -392,14 +401,14 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
userQuery.setRoleSid(candidateGroups.get(0));
userQuery.setOrgSidPath("11/11/" + callInOrgSid + "/11");
List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
StringBuilder nextNodeUserSids =new StringBuilder();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {
String sid = sysUserVo.getSid();
nextNodeUserSids.append(sid).append(",");
}
}
String substring = nextNodeUserSids.substring(0,nextNodeUserSids.lastIndexOf(","));
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
}
if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml

@ -10,6 +10,7 @@
<where>
${ew.sqlSegment}
</where>
ORDER BY proSchAppNo DESC
</select>
<select id="selectListAllVo"

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@ -138,7 +138,9 @@
<!--保险杠(欧曼)-->
bmc.bumper,
<!--备注-->
bmc.remarks
bmc.remarks,
<!--创建组织名称-->
bmc.createOrg
FROM base_model_config bmc
<where>
${ew.sqlSegment}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml

@ -12,6 +12,7 @@
SELECT count(*)
FROM base_vehicle_brand
WHERE brandCode = #{brandCode}
AND isDelete = 0
AND sid
&lt;&gt;
#{sid}
@ -99,6 +100,8 @@
SELECT bvb.brandName, bvb.sid
FROM base_vehicle_brand bvb
where bvb.manufacturerSid = #{manufacturerSid}
AND bvb.isDelete = 0
AND bvb.isValidity = 1
</select>
<!--根据分公司sid查询所有品牌列表-->
<select id="selectAppListByUserSid"

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java

@ -155,6 +155,7 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
if (StringUtils.isNotBlank(query.getName())) {
qw.like("bvb.brandName", query.getName());
}
qw.eq("bvb.isValidity",1);
}
return baseMapper.selectByOrgSid(qw);
}
@ -182,6 +183,7 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
qw.like("bvb.useOrg", name);
}
qw.eq("bvb.isDelete",0);
qw.eq("bvb.isValidity",1);
return baseMapper.namesDown(qw);
}

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

@ -4,23 +4,24 @@
<!--分页列表-->
<select id="pagerList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelVo">
SELECT bvm.sid,
bvm.brandName,
bvm.vehicleTypeValue,
bvm.productLineValue,
bvm.driveFormValue,
bvm.powerValue,
bvm.gearboxTypeValue,
bvm.fuelTypeValue,
bvm.vehicleVersionValue,
bvm.modelName,
bvm.engineTypeValue,
bvm.`vehicleVersionValue` vehicleVersion,
bvm.`vehicleTypeCode`,
bvm.`emissionStandardValue`,
bvm.vehicleAlias
bvm.brandName,
bvm.vehicleTypeValue,
bvm.productLineValue,
bvm.driveFormValue,
bvm.powerValue,
bvm.gearboxTypeValue,
bvm.fuelTypeValue,
bvm.vehicleVersionValue,
bvm.modelName,
bvm.engineTypeValue,
bvm.`vehicleVersionValue` vehicleVersion,
bvm.`vehicleTypeCode`,
bvm.`emissionStandardValue`,
bvm.vehicleAlias,
bvm.createOrgName
FROM base_vehicle_model bvm
LEFT JOIN base_vehicle_brand bvb
ON bvm.carBrand = bvb.sid
LEFT JOIN base_vehicle_brand bvb
ON bvm.carBrand = bvb.sid
<where>
${ew.sqlSegment}
</where>
@ -28,7 +29,7 @@
<!--详情-->
<select id="details" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelDetailsVo">
SELECT
-- <!--厂商名称-->
-- <!--厂商名称-->
bm.manufacturerName,
-- <!--厂商sid-->
bvm.manufacturer,
@ -88,8 +89,8 @@
-- <!--是否可以删除(1是0否)-->
bvm.isDel
FROM base_vehicle_model bvm
LEFT JOIN base_manufacturer bm ON bm.sid = bvm.manufacturer
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
LEFT JOIN base_manufacturer bm ON bm.sid = bvm.manufacturer
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
where bvm.sid = #{sid}
</select>
<!--删除、批量删除-->
@ -124,8 +125,8 @@
<!--发动机号-->
bvm.engineType
FROM base_vehicle_model bvm
left join base_vehicle_brand bvb on bvb.sid = bvm.carBrand
${ew.customSqlSegment}
left join base_vehicle_brand bvb on bvb.sid = bvm.carBrand
${ew.customSqlSegment}
</select>
<!--查询车型信息下拉框-->
<!-- <select id="selectDown" resultType="java.util.List">-->
@ -145,20 +146,20 @@
<!--车型sid-->
bvm.sid
FROM base_vehicle_model bvm
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<select id="selectAppPageByOrgSid" resultType="com.yxt.anrui.base.api.basevehiclemodel.AppBaseVehicleModelVo">
SELECT bvm.sid, bvb.brandName, bm.manufacturerName, bvm.modelName
FROM base_vehicle_model bvm
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
${ew.customSqlSegment}
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
${ew.customSqlSegment}
</select>
<!--根据车型型号模糊查询下拉款-->
<select id="selectDownPlus" resultType="java.util.Map">
select bvm.sid
from base_vehicle_model bvm
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<select id="getPcChooseListByModelSid"
@ -171,10 +172,9 @@
bmc.`specification`,
bmc.`fuelTank`
FROM anrui_base.base_vehicle_model bvm
LEFT JOIN anrui_base.base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
LEFT JOIN anrui_base.base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
WHERE bvm.sid = #{vehicleSid}
LIMIT 1
LEFT JOIN anrui_base.base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
LEFT JOIN anrui_base.base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
WHERE bvm.sid = #{vehicleSid} LIMIT 1
</select>
<select id="getListByModelSid"
resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigVo">
@ -197,7 +197,7 @@
bvm.modelName,
bvm.engineTypeValue
FROM base_model_config bmc
LEFT JOIN base_vehicle_model bvm ON bmc.vehicleSid = bvm.sid
LEFT JOIN base_vehicle_model bvm ON bmc.vehicleSid = bvm.sid
WHERE vehicleSid = #{vehicleSid}
</select>
@ -218,8 +218,8 @@
bmc.configName AS sketChconfiguration,
bv.guidedPrice AS vehicleModelOffer
FROM base_vehicle_model bvm
LEFT JOIN base_vehicle bv ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvm.sid = bmc.vehicleSid
LEFT JOIN base_vehicle bv ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvm.sid = bmc.vehicleSid
WHERE bvm.sid = #{modelSid}
AND bmc.sid = #{configModelSid}
</select>
@ -289,15 +289,15 @@
<!--是否可以删除(1是0否)-->
bvm.isDel
FROM base_vehicle_model bvm
LEFT JOIN base_manufacturer bm ON bm.sid = bvm.manufacturer
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
LEFT JOIN base_manufacturer bm ON bm.sid = bvm.manufacturer
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
where bvm.sid = #{sid}
</select>
<select id="selectDownPlusByModelName" resultType="java.util.Map">
SELECT bvm.modelName, bvm.sid
SELECT bvm.modelName, bvm.sid,bvm.vehicleAlias
FROM base_vehicle_model bvm
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<select id="selectPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
@ -310,9 +310,9 @@
CONCAT(MIN(salesReferencePrice), '-', MAX(salesReferencePrice)) as salesReferencePrice,
bv.configurationItemsSid as configSid
from base_vehicle_model bm
left join base_vehmodel_config bv on bv.modelSid = bm.sid
left join base_model_config bc on bc.sid = bv.configurationItemsSid
${ew.customSqlSegment}
left join base_vehmodel_config bv on bv.modelSid = bm.sid
left join base_model_config bc on bc.sid = bv.configurationItemsSid
${ew.customSqlSegment}
</select>
<select id="downList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelDownListVo">
@ -323,64 +323,65 @@
bvm.`manufacturer`,
bvm.`carBrand`
FROM base_vehicle_model bvm
LEFT JOIN base_manufacturer bm
ON bvm.`manufacturer` = bm.`sid`
LEFT JOIN base_manufacturer bm
ON bvm.`manufacturer` = bm.`sid`
</select>
<!-- <select id="modelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
SELECT DISTINCT bm.sid,
bm.brandName,
bm.carBrand as brandSid,
bm.vehicleAlias,
bm.vehicleVersionValue,
bm.fuelTypeValue,
bm.gearboxTypeValue,
bm.modelName,
(SELECT if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), MAX(bvc.guidedPrice),
CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice)))
FROM base_vehmodel_config bvc
WHERE bvc.modelSid
= bm.sid
AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
(SELECT COUNT(*)
FROM base_vehicle bv
WHERE bv.modelSid = bm.sid
AND bv.useOrg = #{useOrgSid}
AND lockedState = #{lockedStateKey}) AS nowCarNum,
(SELECT COUNT(*)
FROM bus_vehicle_apply_detail bvad
WHERE bvad.vehicleSid = bm.sid) AS productionCarNum
FROM base_vehicle_model bm
LEFT JOIN base_vehmodel_config bvc
ON bm.sid = bvc.modelSid
<where>
${ew.sqlSegment}
</where>
ORDER BY nowCarNum DESC
</select>-->
<!-- <select id="modelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
SELECT DISTINCT bm.sid,
bm.brandName,
bm.carBrand as brandSid,
bm.vehicleAlias,
bm.vehicleVersionValue,
bm.fuelTypeValue,
bm.gearboxTypeValue,
bm.modelName,
(SELECT if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), MAX(bvc.guidedPrice),
CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice)))
FROM base_vehmodel_config bvc
WHERE bvc.modelSid
= bm.sid
AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
(SELECT COUNT(*)
FROM base_vehicle bv
WHERE bv.modelSid = bm.sid
AND bv.useOrg = #{useOrgSid}
AND lockedState = #{lockedStateKey}) AS nowCarNum,
(SELECT COUNT(*)
FROM bus_vehicle_apply_detail bvad
WHERE bvad.vehicleSid = bm.sid) AS productionCarNum
FROM base_vehicle_model bm
LEFT JOIN base_vehmodel_config bvc
ON bm.sid = bvc.modelSid
<where>
${ew.sqlSegment}
</where>
ORDER BY nowCarNum DESC
</select>-->
<!-- <select id="notTheCompanyModelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
SELECT bvc.useOrgSid,
(SELECT count(*)
FROM base_vehicle bv
WHERE bv.modelSid = bvc.modelSid
and bv.useOrg = bvc.useOrgSid) AS nowCarNum,
(SELECT count(*) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bm.sid) AS productionCarNum
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bm ON bvc.modelSid = bm.sid
<where>
${ew.sqlSegment}
</where>
group by bvc.useOrgSid
</select>-->
<!-- <select id="notTheCompanyModelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
SELECT bvc.useOrgSid,
(SELECT count(*)
FROM base_vehicle bv
WHERE bv.modelSid = bvc.modelSid
and bv.useOrg = bvc.useOrgSid) AS nowCarNum,
(SELECT count(*) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bm.sid) AS productionCarNum
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bm ON bvc.modelSid = bm.sid
<where>
${ew.sqlSegment}
</where>
group by bvc.useOrgSid
</select>-->
<select id="listPageByVehmodel" resultType="com.yxt.anrui.base.api.basevehiclemodel.VehModelVo">
SELECT bvm.`brandName`, bvm.`modelName`, bmc.`configName`, bmc.otherConfig, bvc.guidedPrice,bvc.modelSid,bvc.configurationItemsSid configSid
SELECT bvm.`brandName`, bvm.`modelName`, bmc.`configName`, bmc.otherConfig,
bvc.guidedPrice,bvc.modelSid,bvc.configurationItemsSid configSid
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`
LEFT JOIN base_vehicle_model bvm
ON bvc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc
ON bvc.`configurationItemsSid` = bmc.`sid`
<where>
${ew.sqlSegment}
</where>
@ -420,8 +421,8 @@
SELECT bmc.sid,
bmc.`configName`
FROM base_model_config bmc
LEFT JOIN base_vehmodel_config bvc
ON bmc.sid = bvc.`configurationItemsSid`
LEFT JOIN base_vehmodel_config bvc
ON bmc.sid = bvc.`configurationItemsSid`
WHERE bvc.`modelSid` = #{modelSid}
and bvc.useOrgSid = #{orgSid}
</select>

8
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java

@ -65,10 +65,10 @@ public class SysOrganizationVo implements Vo {
private String zgNames;
@ApiModelProperty("分管人员名称")
private String fgNames;
@ApiModelProperty("主管人员sids")
private String zgSids;
@ApiModelProperty("分管人员sids")
private String fgSids;
@ApiModelProperty("主管人员sid")
private String zgStaffSid;
@ApiModelProperty("分管人员sid")
private String fgStaffSid;
@ApiModelProperty("是否是部门(0否,1是)")
private Integer isDept;

1
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@ -127,6 +127,7 @@
SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
FROM sys_organization so
WHERE psid = #{psid}
ORDER BY so.sort ASC
</select>
<select id="getUseOrgByUserSid" resultType="com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo">

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@ -167,9 +167,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
SysOrganizationVo vo = new SysOrganizationVo();
BeanUtil.copyProperties(entity, vo);
vo.setFgNames(fgNames);
vo.setFgSids(fgSids);
vo.setFgStaffSid(fgSids);
vo.setZgNames(zgNames);
vo.setZgSids(zgSids);
vo.setZgStaffSid(zgSids);
return rb.success().setData(vo);
}

9
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java

@ -71,7 +71,10 @@ public class ScmWarehouse extends BaseEntity {
@ApiModelProperty("仓库负责人sid")
private String warehouseContractSid; // 仓库负责人sid
@ApiModelProperty("分组")
private String warehouseGroup; // 分组
@ApiModelProperty("存放地点分组key")
private String warehouseGroupKey; // 存放地点分组key
@ApiModelProperty("存放地点分组value")
private String warehouseGroupValue; // 存放地点分组value
}

120
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java

@ -30,6 +30,7 @@ import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-scm(进销存) <br/>
@ -45,6 +46,7 @@ import io.swagger.annotations.ApiModelProperty;
* @since 1.0
*/
@ApiModel(value = "仓库 数据传输对象", description = "仓库 数据传输对象")
@Data
public class ScmWarehouseDto implements Dto {
@ -69,119 +71,9 @@ public class ScmWarehouseDto implements Dto {
@ApiModelProperty("仓库负责人sid")
private String warehouseContractSid; // 仓库负责人sid
@ApiModelProperty("分组")
private String warehouseGroup; // 分组
@ApiModelProperty("存放地点分组key")
private String warehouseGroupKey; // 存放地点分组key
/**
* @return 使用组织
*/
public String getUseOrg(){
return useOrg;
}
/**
* @param useOrg 使用组织 to set
*/
public void setUseOrg(String useOrg){
this.useOrg = useOrg;
}
/**
* @return 使用组织sid
*/
public String getUseOrgSid(){
return useOrgSid;
}
/**
* @param useOrgSid 使用组织sid to set
*/
public void setUseOrgSid(String useOrgSid){
this.useOrgSid = useOrgSid;
}
/**
* @return 编码
*/
public String getWarehouseCode(){
return warehouseCode;
}
/**
* @param warehouseCode 编码 to set
*/
public void setWarehouseCode(String warehouseCode){
this.warehouseCode = warehouseCode;
}
/**
* @return 名称
*/
public String getWarehouseName(){
return warehouseName;
}
/**
* @param warehouseName 名称 to set
*/
public void setWarehouseName(String warehouseName){
this.warehouseName = warehouseName;
}
/**
* @return 仓库属性
*/
public String getWarehouseAttribute(){
return warehouseAttribute;
}
/**
* @param warehouseAttribute 仓库属性 to set
*/
public void setWarehouseAttribute(String warehouseAttribute){
this.warehouseAttribute = warehouseAttribute;
}
/**
* @return 仓库负责人
*/
public String getWarehouseContract(){
return warehouseContract;
}
/**
* @param warehouseContract 仓库负责人 to set
*/
public void setWarehouseContract(String warehouseContract){
this.warehouseContract = warehouseContract;
}
/**
* @return 仓库负责人sid
*/
public String getWarehouseContractSid(){
return warehouseContractSid;
}
/**
* @param warehouseContractSid 仓库负责人sid to set
*/
public void setWarehouseContractSid(String warehouseContractSid){
this.warehouseContractSid = warehouseContractSid;
}
/**
* @return 分组
*/
public String getWarehouseGroup(){
return warehouseGroup;
}
/**
* @param warehouseGroup 分组 to set
*/
public void setWarehouseGroup(String warehouseGroup){
this.warehouseGroup = warehouseGroup;
}
@ApiModelProperty("存放地点分组value")
private String warehouseGroupValue; // 存放地点分组value
}

9
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java

@ -72,7 +72,10 @@ public class ScmWarehouseVo implements Vo {
@ApiModelProperty("仓库负责人sid")
private String warehouseContractSid; // 仓库负责人sid
@ApiModelProperty("分组")
private String warehouseGroup; // 分组
@ApiModelProperty("存放地点分组key")
private String warehouseGroupKey; // 存放地点分组key
@ApiModelProperty("存放地点分组value")
private String warehouseGroupValue; // 存放地点分组value
}

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

@ -169,11 +169,17 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
scmApplyInboundVehicleService.save(scmApplyInboundVehicle);
}
}else{
new ResultBean().fail().setMsg("车辆台数填写不正确");
return new ResultBean().fail().setMsg("车辆台数填写不正确");
}
return new ResultBean().success().setMsg("保存成功").setData(inboundVehicle.getSid());
} else { // 修改
List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
if (vehicleList.size() == 0){
return new ResultBean().fail().setMsg("车辆列表不能为空");
}
if (StringUtils.isBlank(dto.getDepartureDate())){
return new ResultBean().fail().setMsg("请填写厂家发车日期");
}
List<String> vinNoList = vehicleList.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList());
// 采购订单下线日期一旦维护,二次确认,则不能修改 TODO
// 验证数据库是否重复

Loading…
Cancel
Save