yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 2 years ago
parent
08c160204d a62ec20332
commit
b46b8584c1
16 changed files with 425 additions and 112 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java
  2. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateDto.java
  3. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java
  4. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
  5. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java
  6. 71
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
  7. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java
  8. 104
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
  9. 295
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  10. 16
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  11. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
  12. 9
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
  13. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  14. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  15. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  16. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java
View File

@ -36,6 +36,8 @@ public class BaseVehicleState extends BaseEntity {
private String packageBusiness;
@ApiModelProperty("合同状态")
private String contractState;
private String saleTypeKey;
private String finSourceKey;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateDto.java
View File

@ -21,4 +21,8 @@ public class BaseVehicleStateDto implements Dto {
private String busSid;
@ApiModelProperty("操作类型")
private String operateType;
@ApiModelProperty("销售类型：1全款，2贷款")
private String saleTypeKey;
@ApiModelProperty("款项来源：1自有资金、2三方金融、3担保、4非担保")
private String finSourceKey;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java
View File

@ -71,6 +71,8 @@ public class BaseVehicleStateEnum {
DDBA_SAVEVIN("6", "录入车架号"),
FIN_RQ("7", "认款完成"),
FIN_WRQ("8", "认款未完成"),
CKTJ("9", "出库提交"),
CKZZ("10", "出库终止、驳回以及撤回到第一环节时"),
;

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
View File

@ -61,6 +61,12 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
}else if(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey().equals(operateType)){
//认款办理确认以及结转审核通过的更新款项状态为1 已交清，否则为0
baseVehicleState.setFinState(BaseVehicleStateEnum.BusStateEnum.FIN_STATE_WJQ.getStateKey());
}else if(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey().equals(operateType)){
//出库提交申请后，将小状态修改为出库中402
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_2.getStateKey());
}else if(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey().equals(operateType)){
//出库申请终止后，将小状态修改为401待出库
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
}

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java
View File

@ -99,7 +99,8 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
List<String> selectByState();
IPage<BusDeliveredVo> selectListsVos(IPage<BusDelivered> page, @Param(Constants.WRAPPER)QueryWrapper<BusDelivered> qw);
IPage<BusDeliveredVo> selectListsVoNew(IPage<BusDelivered> page, @Param(Constants.WRAPPER)QueryWrapper<BusDelivered> qw);
IPage<AppBusDeliveredPageVo> getRetrievalNotLists(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER)QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
IPage<AppBusDeliveredPageVo> getRetrievalNotListNew(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER)QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
}

71
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
View File

@ -155,24 +155,6 @@
and finState = '1'
</select>
<select id="selectListsVos" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
SELECT bv.sid,
bo.contractNo,
bo.customerName name,
bv.sid busVinSid,
'正常交款' as subscription,
bo.payType paymentMethod,
RIGHT(bv.linkNo, 8) as vinNo,
bv.linkSid as vinSid
FROM bus_sales_order_vehicle bv
left join bus_sales_order bo on bo.sid = bv.salesOrderSid
left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
<where>
${ew.sqlSegment}
and length(bv.linkSid) > 0 and bbv.vehicleStateValue != '出库'
</where>
</select>
<resultMap id="listMap" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
<result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
<collection property="vinList" ofType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo"
@ -296,4 +278,57 @@
GROUP BY
ds.contractNo order by ds.contractNo desc
</select>
<select id="selectListsVoNew" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
select
bo.contractNo,
bo.customerName as name,
bo.payType paymentMethod,
RIGHT(bv.linkNo, 8) as vinNo,
bv.linkSid vinSid,
bv.sid busVinSid
from (select busSid from anrui_base.base_vehicle_state where busState = '401' and finState = '1') as bs
left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
left join bus_sales_order bo on bo.sid = bv.salesOrderSid
left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
<where>
${ew.sqlSegment}
and length(bv.linkSid) > 0
</where>
order by bo.contractNo desc
</select>
<select id="getRetrievalNotListNew" resultMap="listMaps">
select
bo.contractNo,
bo.customerName as name,
bo.payType paymentMethod
from (select busSid from anrui_base.base_vehicle_state where busState = '401' and finState = '1') as bs
left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
left join bus_sales_order bo on bo.sid = bv.salesOrderSid
left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
<where>
${ew.sqlSegment}
and length(bv.linkSid) > 0
</where>
group by contractNo
order by bo.contractNo desc
</select>
<resultMap id="listMaps" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
<result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="paymentMethod" jdbcType="VARCHAR" property="paymentMethod"/>
<collection property="vinList" ofType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo"
select="vinLists" column="contractNo">
</collection>
</resultMap>
<select id="vinLists" resultType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo">
select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin
from (select busSid from anrui_base.base_vehicle_state where busState = '401' and finState = '1') as bs
left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
left join bus_sales_order bo on bo.sid = bv.salesOrderSid
where length(bv.linkSid)>0 and bo.contractNo = #{contractNo}
</select>
</mapper>

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java
View File

@ -68,7 +68,7 @@ public class BusDeliveredRest implements BusDeliveredFeign {
@Override
public ResultBean<PagerVo<BusDeliveredVo>> listPage(@RequestBody PagerQuery<BusDeliveredQuery> pq) {
ResultBean<PagerVo<BusDeliveredVo>> rb = ResultBean.fireFail();
PagerVo<BusDeliveredVo> pv = busDeliveredService.listPageVo(pq);
PagerVo<BusDeliveredVo> pv = busDeliveredService.listPageVoNew(pq);
return rb.success().setData(pv);
}
@ -102,7 +102,7 @@ public class BusDeliveredRest implements BusDeliveredFeign {
@Override
public ResultBean<PagerVo<AppBusDeliveredPageVo>> getRetrievalNotList(PagerQuery<AppBusDeliveredPageQuery> pq) {
ResultBean rb = ResultBean.fireFail();
IPage<AppBusDeliveredPageVo> voIPage = busDeliveredService.getRetrievalNotList(pq);
IPage<AppBusDeliveredPageVo> voIPage = busDeliveredService.getRetrievalNotListNew(pq);
return rb.success().setData(voIPage);
}
@ -118,7 +118,7 @@ public class BusDeliveredRest implements BusDeliveredFeign {
@Override
public ResultBean<List<AppCarListVo>> selectInfo(DeliverDetailsQuery query) {
return busDeliveredService.selectInfo(query);
return busDeliveredService.selectInfoNew(query);
}
@Override

104
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
View File

@ -160,23 +160,17 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
return p;
}
/**
* 待出库车辆分页列表
*
* @param pq 查询条件
* @return 待出库车辆分页列表的数据
*/
public PagerVo<BusDeliveredVo> listPageVos(PagerQuery<BusDeliveredQuery> pq) {
public PagerVo<BusDeliveredVo> listPageVoNew(PagerQuery<BusDeliveredQuery> pq) {
BusDeliveredQuery query = pq.getParams();
QueryWrapper<BusDelivered> qw = new QueryWrapper<>();
if (query != null) {
//合同编号
if (StringUtils.isNotBlank(query.getContractNo())) {
qw.like("bd.contractNo", query.getContractNo());
qw.like("bo.contractNo", query.getContractNo());
}
//客户名称
if (StringUtils.isNotBlank(query.getName())) {
qw.like("bd.name", query.getName());
qw.like("bo.name", query.getName());
}
//车架号
if (StringUtils.isNotBlank(query.getVinNo())) {
@ -187,20 +181,15 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
qw.notIn("bv.linkSid", query.getVinSid());
}
//待出库：1，出库申请：0
qw.eq("bd.state", 1);
if (StringUtils.isNotBlank(query.getUserSid())) {
qw.eq("bd.createBySid", query.getUserSid());
qw.eq("bo.createBySid", query.getUserSid());
}
}
//查询所有待出库的车辆busVinSid
List<String> busVinSidList = baseMapper.selectByState();
//查询销售订单中申请人是当前登录人且已办结的，linkSid有值，且在车辆台账中不为出库的。
IPage<BusDelivered> page = PagerUtil.queryToPage(pq);
IPage<BusDeliveredVo> pagging = baseMapper.selectListsVos(page, qw);
IPage<BusDeliveredVo> pagging = baseMapper.selectListsVoNew(page, qw);
PagerVo<BusDeliveredVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BusDeliveredDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
@ -271,7 +260,26 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
return iPage;
}
public IPage<AppBusDeliveredPageVo> getRetrievalNotLists(PagerQuery<AppBusDeliveredPageQuery> pq) {
public IPage<AppBusDeliveredPageVo> getRetrievalNotListNew(PagerQuery<AppBusDeliveredPageQuery> pq) {
QueryWrapper<AppBusDeliveredPageQuery> qw = new QueryWrapper<>();
String name = pq.getParams().getName();
IPage<AppBusDeliveredPageVo> page = PagerUtil.queryToPage(pq);
String orgPath = pq.getParams().getOrgPath();
String orgSid = "";
if (StringUtils.isNotBlank(orgPath)) {
orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
} else {
orgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData();
}
qw.eq("bo.useOrgSid", orgSid);
if (StringUtils.isNotBlank(pq.getParams().getUserSid())) {
qw.eq("bo.createBySid", pq.getParams().getUserSid());
}
IPage<AppBusDeliveredPageVo> iPage = baseMapper.getRetrievalNotListNew(page, qw, name);
return iPage;
}
/* public IPage<AppBusDeliveredPageVo> getRetrievalNotLists(PagerQuery<AppBusDeliveredPageQuery> pq) {
QueryWrapper<AppBusDeliveredPageQuery> qw = new QueryWrapper<>();
String name = pq.getParams().getName();
IPage<AppBusDeliveredPageVo> page = PagerUtil.queryToPage(pq);
@ -298,7 +306,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
record.setVinList(vinListVo);
}
return iPage;
}
}*/
public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
ResultBean<AppDeliveredDetailsVo> rb = ResultBean.fireFail();
@ -408,7 +416,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
// appCarListVo.setDiscount(appOrderPriceInfoVo.getSingleCarDiscountPrice());
//查询该车辆是否有挂车
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid, contractNo);
if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
if (trailerList.getData() != null && trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
appCarListVo.setShowHandCarBtn(false);
} else {
appCarListVo.setShowHandCarBtn(true);
@ -694,6 +702,64 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
return rb.success().setData(list);
}
public ResultBean<List<AppCarListVo>> selectInfoNew(DeliverDetailsQuery query) {
ResultBean<List<AppCarListVo>> rb = ResultBean.fireFail();
//移动端：排除已选车辆后的所有未提交及未出库的车辆集合
//PC端：前端传的已勾选的所有的车辆的集合
String contractNo = query.getContractNo();
List<String> vinSelectSid = query.getVinSelectsid();
vinSelectSid.removeAll(Collections.singleton(null));
List<String> vinSids = query.getVinSids();
vinSids.removeAll(Collections.singleton(null));
List<AppCarListVo> list = new ArrayList<>();
List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByNoAndVinSidsNew(contractNo);
for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
AppCarListVo appCarListVo = new AppCarListVo();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
String vinSid = busSalesOrderVehicle.getLinkSid();
if (!vinSelectSid.isEmpty()) {
if (vinSelectSid.contains(vinSid)) {
continue;
}
}
if (!vinSids.isEmpty()) {
if (vinSids.contains(vinSid)) {
appCarListVo.setVinSid(vinSid);
} else {
continue;
}
} else {
appCarListVo.setVinSid(vinSid);
}
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid, query.getContractNo());
if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
appCarListVo.setShowHandCarBtn(false);
} else {
appCarListVo.setShowHandCarBtn(true);
}
//优惠包使用情况
List<BusDeliveredDetailsDiscountsVo> discountList = new ArrayList<>();
List<BusSalesOrderDiscount> busSalesOrderDiscountList = busSalesOrderDiscountService.selectListByContractNo(contractNo);
for (int j = 0; j < busSalesOrderDiscountList.size(); j++) {
BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo();
BusSalesOrderDiscount orderDiscountVo = busSalesOrderDiscountList.get(j);
busDeliveredDetailsDiscountsVo.setDiscountInfo(orderDiscountVo.getDiscountExplain());
busDeliveredDetailsDiscountsVo.setDiscountSid(orderDiscountVo.getSid());
busDeliveredDetailsDiscountsVo.setDiscountPrice(orderDiscountVo.getPrice());
busDeliveredDetailsDiscountsVo.setDiscountNum(0);
busDeliveredDetailsDiscountsVo.setTotalNum(orderDiscountVo.getNum());
busDeliveredDetailsDiscountsVo.setDiscountName(orderDiscountVo.getName());
discountList.add(busDeliveredDetailsDiscountsVo);
}
appCarListVo.setDiscountUse(discountList);
BusDeliveredUseMessagesVo deliveredUseMessagesVo = new BusDeliveredUseMessagesVo();
deliveredUseMessagesVo.setVin(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8));
appCarListVo.setRealBuyer(deliveredUseMessagesVo);
list.add(appCarListVo);
}
return rb.success().setData(list);
}
public BusDelivered getState(String contractNo, String vinSid) {
return baseMapper.getState(contractNo,vinSid);
}

295
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -42,6 +42,9 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutApplyDto;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
@ -213,6 +216,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
@Autowired
private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
@Autowired
private BaseVehicleStateFeign baseVehicleStateFeign;
/**
@ -780,6 +785,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
baseMapper.updateStateBySid(3, bv.getBusinessSid());
//==============================修改车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
List<String> stringList = busDeliveredApplyDetailsService.selectVinByApplySid(bv.getBusinessSid());
stringList.removeAll(Collections.singleton(null));
if (!stringList.isEmpty()) {
stringList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_PASS.getTypeKey());
baseVehicleStateDto.setBusSid(v);
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
@ -836,10 +866,34 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if ("重新提交".equals(bv.getComment())) {
//将待出库中的车辆更改状态为出库申请0
List<String> stringList = busDeliveredApplyDetailsService.selectVinByApplySid(bv.getBusinessSid());
for (int i = 0; i < stringList.size(); i++) {
//==============================新增车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
stringList.removeAll(Collections.singleton(null));
if (!stringList.isEmpty()) {
stringList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey());
baseVehicleStateDto.setBusSid(v);
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
/*for (int i = 0; i < stringList.size(); i++) {
String vinNo = stringList.get(i);
busDeliveredService.updateState(vinNo, 0);
}
}*/
//更改申请的状态为待审核2
baseMapper.updateStateBySid(2, bv.getBusinessSid());
}
@ -1378,7 +1432,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if ("发起申请".equals(nextName)) {
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
//更新该合同的该车架号的状态为1
busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
//==============================新增车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey());
baseVehicleStateDto.setBusSid(v);
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
baseMapper.updateStateBySid(1, query.getBusinessSid());
}
//极光推送
@ -1477,7 +1555,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if ("发起申请".equals(nextName)) {
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
//更新该合同的该车架号的状态为1
busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
//==============================新增车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey());
baseVehicleStateDto.setBusSid(v);
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
baseMapper.updateStateBySid(1, query.getBusinessSid());
}
@ -1516,7 +1618,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
//更新该合同的该车架号的状态为1
busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
//==============================新增车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey());
baseVehicleStateDto.setBusSid(v);
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
return rb.success().setData(resultBean.getData());
} else {
if (businessTaskId.equals(query.getTaskId())) {
@ -1530,7 +1656,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
//更新该合同的该车架号的状态为1
busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
//==============================新增车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey());
baseVehicleStateDto.setBusSid(v);
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
return rb.success().setData(resultBean.getData());
}
}
@ -1720,6 +1870,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
busDeliveredApplyDetails.setSingleCarDiscountPrice(appCarListVo.getDiscount());
busDeliveredApplyDetails.setVinSid(appCarListVo.getVinSid());
busDeliveredApplyDetails.setApplySid(busDeliveredApply.getSid());
//根据合同编号和车架号查询busVinSId
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(),appCarListVo.getVinSid());
busDeliveredApplyDetails.setBusVinSid(busSalesOrderVehicle.getSid());
BusDeliveredUseMessagesVo busDeliveredUseMessagesVo = appCarListVo.getRealBuyer();
busDeliveredApplyDetails.setVinNo(busDeliveredUseMessagesVo.getVin());
//赠送套餐
@ -1868,6 +2021,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
busDeliveredApplyDetails.setApplySid(busDeliveredApply.getSid());
BusDeliveredUseMessagesVo busDeliveredUseMessagesVo = appCarListVo.getRealBuyer();
busDeliveredApplyDetails.setVinNo(busDeliveredUseMessagesVo.getVin());
//根据合同编号和车架号查询busVinSId
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(),appCarListVo.getVinSid());
busDeliveredApplyDetails.setBusVinSid(busSalesOrderVehicle.getSid());
//赠送套餐
BigDecimal discountAll = BigDecimal.ZERO;
StringBuilder discountRemarks = new StringBuilder();
@ -2190,21 +2346,59 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
//将该申请的车架号的待出库中的状态修改为出库中
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid);
//更新该合同的该车架号的状态为0
busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0);
// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0);
//更新出库申请的状态为待审核2
baseMapper.updateStateBySid(2, sid);
//极光推送
busDeliveredApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("出库申请");
messageFlowableQuery.setMsgContent(busDeliveredApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("出库申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
//==============================新增车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey());
baseVehicleStateDto.setBusSid(v);
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusDeliveredApply finalBusDeliveredApply = busDeliveredApply;
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("出库申请");
messageFlowableQuery.setMsgContent(finalBusDeliveredApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("出库申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
return voResultBean;
}
if (r == 2) {
@ -2219,7 +2413,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
//将该申请的车架号的待出库中的状态修改为出库中
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid);
//更新该合同的该车架号的状态为0
busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0);
// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0);
//==============================新增车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey());
baseVehicleStateDto.setBusSid(v);
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
//更新出库申请的状态为待审核2
baseMapper.updateStateBySid(2, sid);
return complete(bv);
@ -2315,43 +2533,4 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}
return rb.success().setData(deliveredFinVo);
}
// public ResultBean<AppDeliveredApplyInfoVo> getRetrievalDetail(String contractSid) {
// ResultBean<AppDeliveredApplyInfoVo> rb = ResultBean.fireFail();
// AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo();
// BusDeliveredApply busDeliveredApply = fetchBySid(contractSid);
// BeanUtils.copyProperties(busDeliveredApply,vo);
//
// if (vo.getIsTerminal().equals(1)) {
// List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(contractSid);
// voList.removeAll(Collections.singleton(null));
// if (!voList.isEmpty()) {
// for (AppCarListVo v : voList) {
// CrmCustomerTempVo data = crmCustomerTempFeign.selByMobile(vo.getMobile()).getData();
// AppUseInfoVo appUseInfoVo = new AppUseInfoVo();
// appUseInfoVo.setMobile(data.getMobile());
// appUseInfoVo.setCustomer(data.getName());
// appUseInfoVo.setAddress(data.getAddress());
// appUseInfoVo.setIdNumber(data.getIDNumber());
// v.setUseInfo(appUseInfoVo);
// }
// }
// vo.setCarList(voList);
//
// } else if (vo.getIsTerminal().equals(0)) {
// //根据出库申请单的sid查询需要出库的车辆信息
// List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(contractSid);
// for (int i = 0; i < voList.size(); i++) {
// BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
// AppUseInfoVo appUseInfoVo = new AppUseInfoVo();
// appUseInfoVo.setMobile(busDeliveredUseMessage.getMobile());
// appUseInfoVo.setCustomer(busDeliveredUseMessage.getName());
// appUseInfoVo.setAddress(busDeliveredUseMessage.getAddress());
// appUseInfoVo.setIdNumber(busDeliveredUseMessage.getIdNo());
// voList.get(i).setUseInfo(appUseInfoVo);
// }
// vo.setCarList(voList);
// }
// return rb.success().setData(vo);
// }
}

16
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -4775,9 +4775,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
AppOrderDetailsVo vo = resultBean.getData();
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
/* ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
AppOrderDetailsVo vo = resultBean.getData();*/
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(busSalesOrderOne.getType())) {
//更新已选择的车架号的状态为审批中
List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
@ -4798,12 +4798,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}
//==============================新增车辆的持久状态组装数据
busSalesOrderOne = fetchBySid(businessSid);
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusSalesOrder finalBusSalesOrderOne = busSalesOrderOne;
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(businessSid);
@ -4816,6 +4818,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
baseVehicleStateDto.setVinSid(v.getLinkSid());
baseVehicleStateDto.setVinNo(v.getLinkNo());
}
baseVehicleStateDto.setSaleTypeKey(finalBusSalesOrderOne.getPayTypeKey());
baseVehicleStateDto.setFinSourceKey(finalBusSalesOrderOne.getFinancePlan());
baseVehicleStateDto.setBusSid(v.getSid());
dtoList.add(baseVehicleStateDto);
});
@ -4861,9 +4865,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
bv.setInstanceId(dto.getProcInsId());
//流程定义id
bv.setModelId(busSalesOrder.get().getProcDefId());
ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
AppOrderDetailsVo vo = resultBean.getData();
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
/* ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
AppOrderDetailsVo vo = resultBean.getData();*/
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(busSalesOrderOne.getType())) {
//更新已选择的车架号的状态为审批中
List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
View File

@ -114,6 +114,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
BusSalesOrderVehicle selectByNoAndVinSid(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid);
List<BusSalesOrderVehicle> selectByNoAndVinSids(String contractNo);
List<BusSalesOrderVehicle> selectByNoAndVinSidsNew(String contractNo);
List<BusVehicleQKKPVo> appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);

9
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
View File

@ -98,6 +98,15 @@
and length(bv.linkSid) > 0
</select>
<select id="selectByNoAndVinSidsNew"
resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
select bv.linkSid,bv.sid,bv.linkNo
from (select busSid from anrui_base.base_vehicle_state where busState = '401' and finState = '1') as bs
left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
left join bus_sales_order bo on bo.sid = bv.salesOrderSid
where length(bv.linkSid)>0 and bo.contractNo = #{contractNo}
</select>
<select id="appVehicleQKKPList" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPVo">
SELECT bsov.linkNo AS vinNo,
bsov.`linkSid` AS vehSid,

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
View File

@ -278,6 +278,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
return baseMapper.selectByNoAndVinSids(contractNo);
}
public List<BusSalesOrderVehicle> selectByNoAndVinSidsNew(String contractNo) {
return baseMapper.selectByNoAndVinSidsNew(contractNo);
}
public List<BusSalesOrderVehicle> selectListByOrderSid(String saleOrderSid) {
return baseMapper.selectByOrderSid(saleOrderSid);
}

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -1901,7 +1901,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
dtoList.add(baseVehicleStateDto);
}
//根据busVinSid查询待出库中是否存在该数据
ResultBean<BusDelivered> busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
/* ResultBean<BusDelivered> busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
if (busDeliveredResultBean.getData() == null) {
if (leftAll.compareTo(rightAll) <= 0) {//推送待出库
BusDeliveredDto busDeliveredDto = new BusDeliveredDto();
@ -1937,7 +1937,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
busDeliveredDto.setBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto);
}
}
}*/
}
}
@ -2558,7 +2558,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean<String> crmResultBean = crmCustomerTempFeign.saveOrUpdateAppCustomerTemp(crmCustomerTemp);
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
finSelectedReceivablesDetailed.setCollSid(confirmation.getSid());
finSelectedReceivablesDetailed.setReceivablesName("订金");
finSelectedReceivablesDetailed.setReceivablesName("简易订单订金");
finSelectedReceivablesDetailed.setSubscribedOf(1);
finSelectedReceivablesDetailed.setAuditState(1);
finSelectedReceivablesDetailed.setCreateBySid(confirmation.getCreateBySid());

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
View File

@ -78,7 +78,7 @@
and length(furd.busVinSid)
>0
</where>
group by furd.sid
group by furd.sid,furd.contractNo
having receivable>0
order by furd.contractNo desc
</select>
@ -363,7 +363,7 @@
left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid
<where>
${ew.sqlSegment}
and fd.receivablesName != '订金'
and fd.receivablesName not like '%订金%'
and fd.auditState = 3
<if test="name != null and name != ''">
and concat(IFNULL(fd.customerName
@ -498,7 +498,7 @@
) df ON df.receivablesSid = furd.`sid`
<where>
${ew.sqlSegment}
and fd.receivablesName != '订金'
and fd.receivablesName not like '%订金%'
and fd.auditState = 3
<if test="name != null and name != ''">
and concat(IFNULL(fd.customerName

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
View File

@ -93,7 +93,7 @@
${ew.sqlSegment}
and length(furd.busVinSid) > 0
</where>
group by furd.sid,currentReceivableMoney,furd.contractNo
group by furd.sid,currentReceivableMoney>0,furd.contractNo
having currentReceivableMoney>0
order by furd.contractNo desc
</select>

Write Preview
Loading…
Cancel
Save