Browse Source

问题修改

master
God 3 years ago
parent
commit
f6f0209efb
  1. 20
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageQuery.java
  2. 38
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageVo.java
  3. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java
  4. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java
  5. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  6. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  7. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java
  8. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
  9. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  10. 61
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  11. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  12. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  13. 11
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java
  14. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java
  15. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
  16. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
  17. 9
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcertinventory/ScmCertInventoryService.java

20
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageQuery.java

@ -0,0 +1,20 @@
package com.yxt.anrui.base.api.basediscountpackage;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppDiscountpackageQuery implements Query {
@ApiModelProperty("userSid")
private String userSid;
@ApiModelProperty("组织机构sid")
private String orgPath;
@ApiModelProperty("合同编号 客户名称")
private String names;
@ApiModelProperty("申请日期")
private String date;
@ApiModelProperty("1待办 2已办")
private String type;
}

38
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageVo.java

@ -0,0 +1,38 @@
package com.yxt.anrui.base.api.basediscountpackage;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ApiModel(value = "优惠包 视图数据对象", description = "优惠包 视图数据对象")
@Data
public class AppDiscountpackageVo implements Vo {
@ApiModelProperty("优惠包sid")
private String sid;
@ApiModelProperty("合同编号")
private String contractId;
@ApiModelProperty("申请人")
private String applyName;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("申请日期")
private String applyDate;
@ApiModelProperty("是否显示办理按钮 提交后不显示")
private Boolean showHandleBtn;
@ApiModelProperty("车型名称")
private String model;
@ApiModelProperty("台数")
private String number;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java

@ -76,6 +76,10 @@ public interface BaseDiscountpackageFeign {
@ApiOperation("移动端-获取标签")
@GetMapping("/selectAppLableListByUserSid")
ResultBean<List<AppBaseLableListVo>> selectAppListByUserSid(@SpringQueryMap AppLableQuery appLableQuery);
@ApiOperation("移动端-获取优惠包列表")
@PostMapping("/getDiscountManageApplyList")
ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(@RequestBody PagerQuery<AppDiscountpackageQuery> pq);
/*****************************销售政策流程****************************************************/
@ApiOperation("提交销售政策流程")

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java

@ -77,6 +77,11 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig
return null;
}
@Override
public ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
return null;
}
@Override
public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) {
return null;

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

@ -456,6 +456,10 @@ public interface BaseVehicleFeign {
@PostMapping("/selectByVinNoAndOrgSid")
ResultBean<BaseVehicle> selectByVinNoAndOrgSid(@RequestParam("vinNo") String vinNo, @RequestParam("createOrgSid") String createOrgSid);
@ApiOperation("根据物料编码查询排产申请编号")
@PostMapping("/selectByfMaterialID")
ResultBean<String> selectByfMaterialID(@RequestParam("fMaterialID") String fMaterialID);
@ApiOperation("巡检获取车价号:已添加切换机构")
@PostMapping("/getInspectionVinList")
@ResponseBody

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

@ -361,6 +361,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return null;
}
@Override
public ResultBean<String> selectByfMaterialID(String fMaterialID) {
return null;
}
@Override
public ResultBean<PagerVo<InspectionVinVo>> getInspectionVinList(PagerQuery<InspectionVinQuery> pagerQuery) {
return null;

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java

@ -146,6 +146,14 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign {
return baseDiscountpackageService.selectAppListByUserSid(appLableQuery);
}
@Override
public ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
PagerVo<AppDiscountpackageVo> page = new PagerVo<>();
IPage<AppDiscountpackageVo> iPage = baseDiscountpackageService.getDiscountManageApplyList(pq);
PagerVo<AppDiscountpackageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
return new ResultBean<PagerVo<AppDiscountpackageVo>>().success().setData(pagerVo);
}
@Override
public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) {
return baseDiscountpackageService.submitBaseDiscountpackage(dto);

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@ -711,4 +711,8 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
}
return rb.success().setData(appBaseLableListVos);
}
public IPage<AppDiscountpackageVo> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
return null;
}
}

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

@ -484,4 +484,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
List<AppBaseVinNowCarVo> getStockModelNowCarList(@Param(Constants.WRAPPER) QueryWrapper<AppBaseVinNowCarVo> qw);
AppBaseConfigOrderCarVo getStockModelSidAndConfigSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
String selectByfMaterialID(String fMaterialID);
}

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

@ -697,7 +697,7 @@
<select id="getAppModelConfig"
resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo">
SELECT convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price,
bvc.guidedPrice as prices,
bvc.guidedPrice as prices,
bvc.priceValidity AS `date`,
bvm.vehicleAlias AS model,
bvm.brandName AS brand,
@ -921,7 +921,7 @@
as isFictitious
from base_vehicle bv
<where>
${ew.sqlSegment} and bv.lockedState = '01' AND (
${ew.sqlSegment} and bv.lockedState = '01' AND (
bv.vehicleStateValue = '库存'
or bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入'
@ -932,7 +932,6 @@
</where>
</if>
order by isFictitious desc
</select>
<select id="fetchVehicle" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
@ -952,7 +951,7 @@
</select>
<select id="selectVehicleCount" resultType="java.lang.Integer">
select sum(sum1) from( select count(*) as sum1
select sum(sum1) from( select count(*) as sum1
from base_vehicle bv
<where>
${ew.sqlSegment} and bv.lockedState = '03' AND (
@ -975,7 +974,8 @@
#{item}
</foreach>
</where>
</if>) as total
</if>
) as total
</select>
<select id="selectByModelSidAndConfigSid"
@ -983,12 +983,15 @@
SELECT bvm.vehicleAlias AS modelName,
convert(bc.guidedPrice / 10000, decimal (10, 2)) AS price,
bmc.configName AS commonlyConfig,
(SELECT GROUP_CONCAT(bvl.labelName) FROM base_vehmodel_label bvl
LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc
ON bvc.`sid` = bvcl.`vehmodelConfigSid`
WHERE bvc.modelSid = bvm.sid AND bvc.`configurationItemsSid` = bmc.sid AND bvc.`useOrgSid` = #{useOrg}) AS labelName
(SELECT GROUP_CONCAT(bvl.labelName)
FROM base_vehmodel_label bvl
LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc
ON bvc.`sid` = bvcl.`vehmodelConfigSid`
WHERE bvc.modelSid = bvm.sid
AND bvc.`configurationItemsSid` = bmc.sid
AND bvc.`useOrgSid` = #{useOrg}) AS labelName
FROM base_vehmodel_config bc
LEFT JOIN base_vehicle_model bvm ON bc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bc.configurationItemsSid = bmc.`sid`
@ -1044,11 +1047,11 @@
</select>
<select id="selectAppListOne" resultType="com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo">
select bv.vinNo vin,
select bv.vinNo vin,
bv.locationName address,
bv.sid carSid,
bv.sid carSid,
if(bv.lockedState = '01', 1, 0)
as isFictitious
as isFictitious
from base_vehicle bv
where bv.modelSid = #{modelSid}
and bv.modelConfigSid = #{configSid}
@ -1061,7 +1064,7 @@
)
<if test="list != null and list.size() != 0">
and bv.sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
@ -1512,10 +1515,10 @@
SELECT bv.sid,
bv.vinNo AS vin,
bv.vehicleStateValue AS `state`,
bmc.carColor AS color,
bmc.carColor AS color,
bv.locationName AS address,
bd.salesPolicy AS label,
bdv.guidedQKPrice AS promotionPrice
bd.salesPolicy AS label,
bdv.guidedQKPrice AS promotionPrice
FROM base_vehicle bv
LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
LEFT JOIN base_discountpackage_veh bdv
@ -1529,12 +1532,15 @@
select bvm.vehicleAlias AS modelName,
convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price,
bmc.configName AS commonlyConfig,
(SELECT GROUP_CONCAT(bvl.labelName) FROM base_vehmodel_label bvl
LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc
ON bvc.`sid` = bvcl.`vehmodelConfigSid`
WHERE bvc.modelSid = bvm.sid AND bvc.`configurationItemsSid` = bmc.sid AND bvc.`useOrgSid` = #{useOrg}) AS labelName
(SELECT GROUP_CONCAT(bvl.labelName)
FROM base_vehmodel_label bvl
LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc
ON bvc.`sid` = bvcl.`vehmodelConfigSid`
WHERE bvc.modelSid = bvm.sid
AND bvc.`configurationItemsSid` = bmc.sid
AND bvc.`useOrgSid` = #{useOrg}) AS labelName
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`
@ -1542,4 +1548,11 @@
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg}
</select>
<select id="selectByfMaterialID" resultType="java.lang.String">
SELECT orderingNo
FROM base_vehicle
WHERE vinNo like concat('%', #{fMaterialID}, '%'))
LIMIT 1
</select>
</mapper>

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

@ -1193,6 +1193,13 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return rb.success().setData(baseVehicle);
}
@Override
public ResultBean<String> selectByfMaterialID(String fMaterialID) {
ResultBean rb = ResultBean.fireFail();
String orderingNo = baseVehicleService.selectByfMaterialID(fMaterialID);
return rb.success().setData(orderingNo);
}
@Override
public ResultBean<PagerVo<InspectionVinVo>> getInspectionVinList(PagerQuery<InspectionVinQuery> pagerQuery) {
if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {

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

@ -3488,4 +3488,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
appBaseConfigOrderCarVo.setCarDetailPage(appVehicleVersionVo);
return appBaseConfigOrderCarVo;
}
public String selectByfMaterialID(String fMaterialID) {
return baseMapper.selectByfMaterialID(fMaterialID);
}
}

11
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java

@ -2,6 +2,7 @@ package com.yxt.anrui.fin.biz.kingdee.saloutstock;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
import com.yxt.anrui.fin.api.kingdee.KingDeeCode;
@ -11,6 +12,7 @@ import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQuery;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@ -22,6 +24,9 @@ import java.util.Map;
@Service
public class SalOutStockService extends FinKingDeeService {
@Autowired
private BaseVehicleFeign baseVehicleFeign;
/**
* 保存采购出库单
* @param salOutStock
@ -53,7 +58,11 @@ public class SalOutStockService extends FinKingDeeService {
if(!IsBatchManage){//是否启用批号
f.setFlot("");//没有启用批号
}else{
f.setFlot(f.getFMaterialID());//启用批号
//启用批号
String fMaterialID = f.getFMaterialID();
//获取排产订单编号
String orderingNo = baseVehicleFeign.selectByfMaterialID(fMaterialID).getData();
f.setFlot(orderingNo);
}
String fStockID = f.getFStockID();
if(!"ARZTCK".equals(fStockID)){//如果不是在途仓库 设置成安瑞正式仓库

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

@ -100,6 +100,9 @@ public class ScmApplyInbound extends BaseEntity {
@ApiModelProperty("厂家发车日期")
private String departureDate;
@ApiModelProperty("公司入库日期")
private String orgPriceDate;
@ApiModelProperty("厂家入库日期")
private String priceDate;

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

@ -117,6 +117,8 @@ public class ScmApplyInboundDto implements Dto {
@ApiModelProperty("内部编码")
private String insideCode;
@ApiModelProperty("公司入库日期")
private String orgPriceDate;
@ApiModelProperty("厂家入库日期")
private String priceDate;
@ApiModelProperty("厂家发车日期")

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

@ -128,6 +128,10 @@ public class ScmApplyInboundVo implements Vo {
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("公司入库日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date orgPriceDate;
@ApiModelProperty("厂家入库日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date priceDate;

9
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcertinventory/ScmCertInventoryService.java

@ -29,6 +29,8 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateDetailsVo;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
@ -72,6 +74,8 @@ public class ScmCertInventoryService extends MybatisBaseService<ScmCertInventory
private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
@Autowired
private ScmCertStayInventoryService scmCertStayInventoryService;
@Autowired
private BaseVehicleFeign baseVehicleFeign;
private QueryWrapper<ScmCertInventory> createQueryWrapper(ScmCertInventoryQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -158,10 +162,13 @@ public class ScmCertInventoryService extends MybatisBaseService<ScmCertInventory
for (BaseVehicleCertificateDetailsVo datum : data) {
String certificationNo = datum.getCertificationNo();
String vehicleSid = datum.getVehicleSid();
//获取车辆库存状态
BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vehicleSid).getData();
String vehicleState = baseVehicleSelectVo.getVehicleState();
ScmCertStayInventory scmCertStayInventory = scmCertStayInventoryService.checkStayIsExi(certificationNo, vehicleSid, createOrgSid);
if (scmCertStayInventory != null) {
scmCertStayInventoryService.updateIsDelete(scmCertStayInventory.getSid());
} else {
} else if (!"0002".equals(vehicleState) && !"004".equals(datum.getTransferStateKey())){
ScmCertStayInventory new_scmCertStayInventory = new ScmCertStayInventory();
new_scmCertStayInventory.setCertNo(datum.getCertificationNo());
new_scmCertStayInventory.setVehSid(datum.getVehicleSid());

Loading…
Cancel
Save