|
@@ -2,6 +2,7 @@ package com.fjhx.sale.service.contract.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.fjhx.file.utils.ObsFileUtil;
|
|
import com.fjhx.file.utils.ObsFileUtil;
|
|
@@ -16,12 +17,15 @@ import com.fjhx.sale.entity.contract.vo.ContractOutboundRecordsVo;
|
|
import com.fjhx.sale.mapper.contract.ContractOutboundInfoMapper;
|
|
import com.fjhx.sale.mapper.contract.ContractOutboundInfoMapper;
|
|
import com.fjhx.sale.service.contract.ContractOutboundInfoService;
|
|
import com.fjhx.sale.service.contract.ContractOutboundInfoService;
|
|
import com.fjhx.sale.service.contract.ContractOutboundRecordsService;
|
|
import com.fjhx.sale.service.contract.ContractOutboundRecordsService;
|
|
|
|
+import com.fjhx.sale.service.contract.ContractService;
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
import com.ruoyi.common.utils.wrapper.SqlField;
|
|
import com.ruoyi.common.utils.wrapper.SqlField;
|
|
import com.ruoyi.system.utils.UserUtil;
|
|
import com.ruoyi.system.utils.UserUtil;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
|
+import java.util.Collections;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
@@ -40,6 +44,8 @@ public class ContractOutboundInfoServiceImpl extends ServiceImpl<ContractOutboun
|
|
private ContractOutboundRecordsService contractOutboundRecordsService;
|
|
private ContractOutboundRecordsService contractOutboundRecordsService;
|
|
@Autowired
|
|
@Autowired
|
|
private ProductInfoService productInfoService;
|
|
private ProductInfoService productInfoService;
|
|
|
|
+ @Resource
|
|
|
|
+ private ContractService contractService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Page<ContractOutboundInfoVo> getPage(ContractOutboundInfoSelectDto dto) {
|
|
public Page<ContractOutboundInfoVo> getPage(ContractOutboundInfoSelectDto dto) {
|
|
@@ -60,6 +66,7 @@ public class ContractOutboundInfoServiceImpl extends ServiceImpl<ContractOutboun
|
|
return baseMapper.getList(wrapper);
|
|
return baseMapper.getList(wrapper);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @DSTransactional
|
|
@Override
|
|
@Override
|
|
public void loadTruck(ContractOutboundInfoDto dto) {
|
|
public void loadTruck(ContractOutboundInfoDto dto) {
|
|
this.updateById(dto);
|
|
this.updateById(dto);
|
|
@@ -67,6 +74,10 @@ public class ContractOutboundInfoServiceImpl extends ServiceImpl<ContractOutboun
|
|
contractOutboundRecordsService.updateBatchById(BeanUtil.copyToList(outboundRecordList, ContractOutboundRecords.class));
|
|
contractOutboundRecordsService.updateBatchById(BeanUtil.copyToList(outboundRecordList, ContractOutboundRecords.class));
|
|
ObsFileUtil.saveFile(dto.getFileList(), dto.getId(), 0);
|
|
ObsFileUtil.saveFile(dto.getFileList(), dto.getId(), 0);
|
|
ObsFileUtil.saveFile(dto.getTruckFileList(), dto.getId(), 1);
|
|
ObsFileUtil.saveFile(dto.getTruckFileList(), dto.getId(), 1);
|
|
|
|
+
|
|
|
|
+ //触发自动结清
|
|
|
|
+ ContractOutboundInfo byId = this.getById(dto.getId());
|
|
|
|
+ contractService.autoSettle(Collections.singletonList(byId.getContractId()));
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|