Browse Source

物品移交记录到业务下

master
dimengzhe 2 years ago
parent
commit
f1362c02a2
  1. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceVo.java
  2. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordEnum.java
  3. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecords.java
  4. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsDto.java
  5. 20
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java
  6. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeignFallback.java
  7. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsQuery.java
  8. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsVo.java
  9. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  10. 25
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java
  11. 12
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java
  12. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml
  13. 46
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java
  14. 72
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java
  15. 46
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java
  16. 46
      doc/databases/bus-center_tables.sql
  17. 44
      doc/databases/scm_tables.sql

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmRecordsInvoiceVo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceVo.java

@ -1,4 +1,4 @@
package com.yxt.anrui.scm.api.scmtransferrecords;
package com.yxt.anrui.buscenter.api.bustransferrecords;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
@ -12,7 +12,7 @@ import java.util.List;
* @date: 2023/6/5
**/
@Data
public class ScmRecordsInvoiceVo implements Vo {
public class BusRecordsInvoiceVo implements Vo {
private static final long serialVersionUID = 5607692895870869172L;
private String vinSid;
//车架号

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordEnum.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordEnum.java

@ -1,11 +1,11 @@
package com.yxt.anrui.scm.api.scmtransferrecords;
package com.yxt.anrui.buscenter.api.bustransferrecords;
/**
* @description: 物品移交类型
* @author: dimengzhe
* @date: 2023/6/5
**/
public enum ScmTransferRecordEnum {
public enum BusTransferRecordEnum {
FP("01", "发票"),

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecords.java

@ -1,4 +1,4 @@
package com.yxt.anrui.scm.api.scmtransferrecords;
package com.yxt.anrui.buscenter.api.bustransferrecords;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
@ -12,7 +12,7 @@ import java.util.Date;
* @date: 2023/6/5
**/
@Data
public class ScmTransferRecords extends BaseEntity {
public class BusTransferRecords extends BaseEntity {
private static final long serialVersionUID = 9087540680738846795L;
@ApiModelProperty("移交物品sid")

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsDto.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsDto.java

@ -1,4 +1,4 @@
package com.yxt.anrui.scm.api.scmtransferrecords;
package com.yxt.anrui.buscenter.api.bustransferrecords;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
@ -12,7 +12,7 @@ import java.util.List;
* @date: 2023/6/5
**/
@Data
public class ScmTransferRecordsDto implements Dto {
public class BusTransferRecordsDto implements Dto {
private static final long serialVersionUID = 4444291069272893613L;
@ApiModelProperty("合同编号")
private String contractNo;

20
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java

@ -1,4 +1,4 @@
package com.yxt.anrui.scm.api.scmtransferrecords;
package com.yxt.anrui.buscenter.api.bustransferrecords;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -18,25 +18,25 @@ import org.springframework.web.bind.annotation.RequestParam;
**/
@Api(tags = "物品移交记录")
@FeignClient(
contextId = "anrui-scm-ScmTransferRecords",
name = "anrui-scm",
path = "v1/ScmTransferRecords",
fallback = ScmTransferRecordsFeignFallback.class)
public interface ScmTransferRecordsFeign {
contextId = "anrui-buscenter-BusTransferRecords",
name = "anrui-buscenter",
path = "v1/BusTransferRecords",
fallback = BusTransferRecordsFeignFallback.class)
public interface BusTransferRecordsFeign {
@ApiOperation("分页列表")
@PostMapping("/pagerList")
public ResultBean<PagerVo<ScmTransferRecordsVo>> pagerList(@RequestBody PagerQuery<ScmTransferRecordsQuery> pq);
public ResultBean<PagerVo<BusTransferRecordsVo>> pagerList(@RequestBody PagerQuery<BusTransferRecordsQuery> pq);
@ApiOperation("新增")
@PostMapping("/saveRecords")
ResultBean saveRecords(@RequestBody ScmTransferRecordsDto dto);
ResultBean saveRecords(@RequestBody BusTransferRecordsDto dto);
@ApiOperation("发票接收确认初始化")
@GetMapping("/getInvoiceInfo")
ResultBean<ScmRecordsInvoiceVo> getInvoiceInfo(@RequestParam("sid") String sid);
ResultBean<BusRecordsInvoiceVo> getInvoiceInfo(@RequestParam("sid") String sid);
@ApiOperation("根据接收人sid以及车辆sid查询是否有待接收记录")
@GetMapping("/selectByVinSid")
ResultBean<ScmTransferRecords> selectByVinSid(@RequestParam("vinSid") String vinSid, @RequestParam("receiveUserSid") String receiveUserSid);
ResultBean<BusTransferRecords> selectByVinSid(@RequestParam("vinSid") String vinSid, @RequestParam("receiveUserSid") String receiveUserSid);
}

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeignFallback.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeignFallback.java

@ -1,4 +1,4 @@
package com.yxt.anrui.scm.api.scmtransferrecords;
package com.yxt.anrui.buscenter.api.bustransferrecords;
import org.springframework.stereotype.Component;
@ -8,5 +8,5 @@ import org.springframework.stereotype.Component;
* @date: 2023/6/5
**/
@Component
public class ScmTransferRecordsFeignFallback {
public class BusTransferRecordsFeignFallback {
}

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsQuery.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsQuery.java

@ -1,4 +1,4 @@
package com.yxt.anrui.scm.api.scmtransferrecords;
package com.yxt.anrui.buscenter.api.bustransferrecords;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
@ -10,7 +10,7 @@ import lombok.Data;
* @date: 2023/6/5
**/
@Data
public class ScmTransferRecordsQuery implements Query {
public class BusTransferRecordsQuery implements Query {
private static final long serialVersionUID = 1398412884121486811L;
private String menuUrl;

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsVo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsVo.java

@ -1,4 +1,4 @@
package com.yxt.anrui.scm.api.scmtransferrecords;
package com.yxt.anrui.buscenter.api.bustransferrecords;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
@ -10,7 +10,7 @@ import lombok.Data;
* @date: 2023/6/5
**/
@Data
public class ScmTransferRecordsVo implements Vo {
public class BusTransferRecordsVo implements Vo {
private static final long serialVersionUID = -2648064038807719461L;
@ApiModelProperty("合同编号")

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -675,7 +675,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(1, 2,
ExecutorService pool = new ThreadPoolExecutor(1, 10,
1000, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid());

25
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@ -44,10 +44,12 @@ import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepa
import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo;
import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle;
import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitDto;
import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords;
import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover;
import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService;
import com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitService;
import com.yxt.anrui.buscenter.biz.bustransferrecords.BusTransferRecordsService;
import com.yxt.anrui.buscenter.biz.busvehicleinformation.BusVehicleInformationService;
import com.yxt.anrui.buscenter.biz.busvehicleinformationhandover.BusVehicleInformationHandoverService;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
@ -56,8 +58,6 @@ import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecords;
import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -111,7 +111,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
@Autowired
private BusVehicleInformationService busVehicleInformationService;
@Autowired
private ScmTransferRecordsFeign scmTransferRecordsFeign;
private BusTransferRecordsService busTransferRecordsService;
/* private QueryWrapper<BusHandoverPrepare> createQueryWrapper(BusHandoverPrepareQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -169,16 +169,16 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
public void addHandoverPrepare(BusHandoverPrepareAddDto dto) {
BusHandoverPrepare busHandoverPrepare = new BusHandoverPrepare();
BeanUtil.copyProperties(dto, busHandoverPrepare);
save(busHandoverPrepare);
List<AppBusHandoverPrepareVehicleDto> handoverPrepareVehicleDtos = dto.getAppBusHandoverPrepareVehicleDtos();
if (handoverPrepareVehicleDtos.size() > 0) {
for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) {
BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle);
BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle,"sid");
busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid());
busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle);
busHandoverPrepareVehicleService.insert(busHandoverPrepareVehicle);
}
}
save(busHandoverPrepare);
}
/**
@ -199,7 +199,6 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
}*/
QueryWrapper<AppHandoverPreparePageVo> qw = new QueryWrapper<>();
//=======================
params.setMenuSid("ace04aa4-c970-4960-b211-984052f204c3");
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(params.getOrgPath());
privilegeQuery.setMenuSid(params.getMenuSid());
@ -234,15 +233,13 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
return p;
}
} else {
PagerVo<AppHandoverPreparePageVo> p = new PagerVo<>();
return p;
/* PagerVo<AppHandoverPreparePageVo> p = new PagerVo<>();
return p;*/
qw.eq("createBySid", params.getUserSid());
}
if (StringUtils.isNotBlank(params.getType())) {//1待准备,2已准备
qw.eq("handoverPrepareStateKey", params.getType());
}
/* if (StringUtils.isNotBlank(useOrgSid)) {
qw.eq("useOrgSid", useOrgSid);
}*/
if (StringUtils.isNotBlank(params.getContractNo())) {
qw.like("contractNo", params.getContractNo());
}
@ -315,8 +312,8 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
BusHandoverPrepare busHandoverPrepare = fetchBySid(busHandoverPrepareVehicle.getMainSid());
String receiveUserSid = busHandoverPrepare.getCreateBySid();
//根据车辆sid以及销售专员的用户sid查询是否有待接收的记录
ResultBean<ScmTransferRecords> scmTransferRecordsResultBean = scmTransferRecordsFeign.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), receiveUserSid);
if (scmTransferRecordsResultBean.getData() == null) {
ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), receiveUserSid);
if (busTransferRecordsResultBean.getData() == null) {
return rb.setMsg("发票未准备好");
}
AppInvoicingInfoVo vo = new AppInvoicingInfoVo();

12
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.java → anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java

@ -1,11 +1,11 @@
package com.yxt.anrui.scm.biz.scmtransferrecords;
package com.yxt.anrui.buscenter.biz.bustransferrecords;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecords;
import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsVo;
import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords;
import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -15,8 +15,8 @@ import org.apache.ibatis.annotations.Param;
* @date: 2023/6/5
**/
@Mapper
public interface ScmTransferRecordsMapper extends BaseMapper<ScmTransferRecords> {
IPage<ScmTransferRecordsVo> pagerList(IPage<ScmTransferRecords> page, @Param(Constants.WRAPPER)QueryWrapper<ScmTransferRecords> qw);
public interface BusTransferRecordsMapper extends BaseMapper<BusTransferRecords> {
IPage<BusTransferRecordsVo> pagerList(IPage<BusTransferRecords> page, @Param(Constants.WRAPPER)QueryWrapper<BusTransferRecords> qw);
ScmTransferRecords selectByVinSid(@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid);
BusTransferRecords selectByVinSid(@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid);
}

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.xml → anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.scm.biz.scmtransferrecords.ScmTransferRecordsMapper">
<select id="pagerList" resultType="com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsVo">
<mapper namespace="com.yxt.anrui.buscenter.biz.bustransferrecords.BusTransferRecordsMapper">
<select id="pagerList" resultType="com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsVo">
select sid,
contractNo,
vinNo,
@ -16,7 +16,7 @@
</where>
</select>
<select id="selectByVinSid" resultType="com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecords">
<select id="selectByVinSid" resultType="com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords">
select *
from scm_transfer_records
where vinSid = #{vinSid}

46
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java

@ -0,0 +1,46 @@
package com.yxt.anrui.buscenter.biz.bustransferrecords;
import com.yxt.anrui.buscenter.api.bustransferrecords.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @description: 物品移交记录
* @author: dimengzhe
* @date: 2023/6/5
**/
@Api(tags = "物品移交记录")
@RestController
@RequestMapping("v1/BusTransferRecords")
public class BusTransferRecordsRest implements BusTransferRecordsFeign {
@Autowired
private BusTransferRecordsService busTransferRecordsService;
@Override
public ResultBean<PagerVo<BusTransferRecordsVo>> pagerList(PagerQuery<BusTransferRecordsQuery> pq) {
ResultBean<PagerVo<BusTransferRecordsVo>> rb = ResultBean.fireFail();
PagerVo<BusTransferRecordsVo> pv = busTransferRecordsService.pagerList(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean saveRecords(BusTransferRecordsDto dto) {
return busTransferRecordsService.saveRecords(dto);
}
@Override
public ResultBean<BusRecordsInvoiceVo> getInvoiceInfo(String sid) {
return busTransferRecordsService.getInvoiceInfo(sid);
}
@Override
public ResultBean<BusTransferRecords> selectByVinSid(String vinSid, String receiveUserSid) {
return busTransferRecordsService.selectByVinSid(vinSid, receiveUserSid);
}
}

72
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java → anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java

@ -1,12 +1,12 @@
package com.yxt.anrui.scm.biz.scmtransferrecords;
package com.yxt.anrui.buscenter.biz.bustransferrecords;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.bustransferrecords.*;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.scm.api.scmtransferrecords.*;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -27,7 +27,7 @@ import java.util.stream.Collectors;
* @date: 2023/6/5
**/
@Service
public class ScmTransferRecordsService extends MybatisBaseService<ScmTransferRecordsMapper, ScmTransferRecords> {
public class BusTransferRecordsService extends MybatisBaseService<BusTransferRecordsMapper, BusTransferRecords> {
@Autowired
private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
@ -36,9 +36,9 @@ public class ScmTransferRecordsService extends MybatisBaseService<ScmTransferRec
@Autowired
private FileUploadComponent fileUploadComponent;
public PagerVo<ScmTransferRecordsVo> pagerList(PagerQuery<ScmTransferRecordsQuery> pq) {
QueryWrapper<ScmTransferRecords> qw = new QueryWrapper<>();
ScmTransferRecordsQuery pagerQuery = pq.getParams();
public PagerVo<BusTransferRecordsVo> pagerList(PagerQuery<BusTransferRecordsQuery> pq) {
QueryWrapper<BusTransferRecords> qw = new QueryWrapper<>();
BusTransferRecordsQuery pagerQuery = pq.getParams();
if (pagerQuery != null) {
if (pagerQuery.getType() == 0) {
qw.eq("receiveState", 0);
@ -49,7 +49,7 @@ public class ScmTransferRecordsService extends MybatisBaseService<ScmTransferRec
apply(StringUtils.isNotBlank(pagerQuery.getReceiveTimeEnd()), "date_format (receiveTime,'%Y-%m-%d') <= date_format('" + pagerQuery.getReceiveTimeEnd() + "','%Y-%m-%d')"
);
}
qw.eq("goodsTypeKey", ScmTransferRecordEnum.FP.getCode());
qw.eq("goodsTypeKey", BusTransferRecordEnum.FP.getCode());
//合同编号
if (StringUtils.isNotBlank(pagerQuery.getContractNo())) {
qw.like("contractNo", pagerQuery.getContractNo());
@ -81,9 +81,9 @@ public class ScmTransferRecordsService extends MybatisBaseService<ScmTransferRec
qw.eq("receiveRoleSid", pagerQuery.getRoleSid());
}
}
IPage<ScmTransferRecords> page = PagerUtil.queryToPage(pq);
IPage<ScmTransferRecordsVo> pagging = baseMapper.pagerList(page, qw);
for (ScmTransferRecordsVo record : pagging.getRecords()) {
IPage<BusTransferRecords> page = PagerUtil.queryToPage(pq);
IPage<BusTransferRecordsVo> pagging = baseMapper.pagerList(page, qw);
for (BusTransferRecordsVo record : pagging.getRecords()) {
String vinSid = record.getVinSid();
//根据合同编号和车辆sid查询开票相关
ResultBean<FinVehicleInvoice> resultBean = finVehicleInvoiceFeign.selectByVinSids(vinSid);
@ -95,47 +95,47 @@ public class ScmTransferRecordsService extends MybatisBaseService<ScmTransferRec
record.setInvoiceNo(finVehicleInvoice.getInvoiceNo());
}
}
PagerVo<ScmTransferRecordsVo> p = PagerUtil.pageToVo(pagging, null);
PagerVo<BusTransferRecordsVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveRecords(ScmTransferRecordsDto dto) {
public ResultBean saveRecords(BusTransferRecordsDto dto) {
ResultBean rb = ResultBean.fireFail();
ScmTransferRecords scmTransferRecords = new ScmTransferRecords();
BeanUtil.copyProperties(dto, scmTransferRecords);
scmTransferRecords.setReceiveState(0);
scmTransferRecords.setCreateBySid(dto.getTransferSid());
baseMapper.insert(scmTransferRecords);
BusTransferRecords BusTransferRecords = new BusTransferRecords();
BeanUtil.copyProperties(dto, BusTransferRecords);
BusTransferRecords.setReceiveState(0);
BusTransferRecords.setCreateBySid(dto.getTransferSid());
baseMapper.insert(BusTransferRecords);
return rb.success();
}
public ResultBean<ScmRecordsInvoiceVo> getInvoiceInfo(String sid) {
ResultBean<ScmRecordsInvoiceVo> rb = ResultBean.fireFail();
ScmRecordsInvoiceVo scmRecordsInvoiceVo = new ScmRecordsInvoiceVo();
ScmTransferRecords scmTransferRecords = fetchBySid(sid);
BeanUtil.copyProperties(scmTransferRecords, scmRecordsInvoiceVo);
ResultBean<FinVehicleInvoice> resultBean = finVehicleInvoiceFeign.selectByVinSids(scmTransferRecords.getVinSid());
public ResultBean<BusRecordsInvoiceVo> getInvoiceInfo(String sid) {
ResultBean<BusRecordsInvoiceVo> rb = ResultBean.fireFail();
BusRecordsInvoiceVo BusRecordsInvoiceVo = new BusRecordsInvoiceVo();
BusTransferRecords BusTransferRecords = fetchBySid(sid);
BeanUtil.copyProperties(BusTransferRecords, BusRecordsInvoiceVo);
ResultBean<FinVehicleInvoice> resultBean = finVehicleInvoiceFeign.selectByVinSids(BusTransferRecords.getVinSid());
if (resultBean.getData() != null) {
FinVehicleInvoice finVehicleInvoice = resultBean.getData();
scmRecordsInvoiceVo.setInvoiceNo(finVehicleInvoice.getInvoiceNo());
scmRecordsInvoiceVo.setInvoiceAmount(finVehicleInvoice.getInvoiceAmount().toString());
scmRecordsInvoiceVo.setInvoiceTitle(finVehicleInvoice.getInvoiceTitle());
scmRecordsInvoiceVo.setInvoiceType(finVehicleInvoice.getInvoiceType());
BusRecordsInvoiceVo.setInvoiceNo(finVehicleInvoice.getInvoiceNo());
BusRecordsInvoiceVo.setInvoiceAmount(finVehicleInvoice.getInvoiceAmount().toString());
BusRecordsInvoiceVo.setInvoiceTitle(finVehicleInvoice.getInvoiceTitle());
BusRecordsInvoiceVo.setInvoiceType(finVehicleInvoice.getInvoiceType());
if (StringUtils.isNotBlank(finVehicleInvoice.getFilePath())) {
List<String> filePathList = Arrays.asList(finVehicleInvoice.getFilePath().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
scmRecordsInvoiceVo.setFilePathList(filePathList);
BusRecordsInvoiceVo.setFilePathList(filePathList);
}
}
if (StringUtils.isNotBlank(scmTransferRecords.getReceiveFiles())) {
List<String> receiveFileList = Arrays.asList(scmTransferRecords.getReceiveFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
scmRecordsInvoiceVo.setReceiveFilesList(receiveFileList);
if (StringUtils.isNotBlank(BusTransferRecords.getReceiveFiles())) {
List<String> receiveFileList = Arrays.asList(BusTransferRecords.getReceiveFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
BusRecordsInvoiceVo.setReceiveFilesList(receiveFileList);
}
return rb.success().setData(scmRecordsInvoiceVo);
return rb.success().setData(BusRecordsInvoiceVo);
}
public ResultBean<ScmTransferRecords> selectByVinSid(String vinSid, String receiveUserSid) {
ResultBean<ScmTransferRecords> rb = ResultBean.fireFail();
ScmTransferRecords scmTransferRecords = baseMapper.selectByVinSid(vinSid,receiveUserSid);
return rb.success().setData(scmTransferRecords);
public ResultBean<BusTransferRecords> selectByVinSid(String vinSid, String receiveUserSid) {
ResultBean<BusTransferRecords> rb = ResultBean.fireFail();
BusTransferRecords BusTransferRecords = baseMapper.selectByVinSid(vinSid,receiveUserSid);
return rb.success().setData(BusTransferRecords);
}
}

46
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java

@ -1,46 +0,0 @@
package com.yxt.anrui.scm.biz.scmtransferrecords;
import com.yxt.anrui.scm.api.scmtransferrecords.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @description: 物品移交记录
* @author: dimengzhe
* @date: 2023/6/5
**/
@Api(tags = "物品移交记录")
@RestController
@RequestMapping("v1/ScmTransferRecords")
public class ScmTransferRecordsRest implements ScmTransferRecordsFeign {
@Autowired
private ScmTransferRecordsService scmTransferRecordsService;
@Override
public ResultBean<PagerVo<ScmTransferRecordsVo>> pagerList(PagerQuery<ScmTransferRecordsQuery> pq) {
ResultBean<PagerVo<ScmTransferRecordsVo>> rb = ResultBean.fireFail();
PagerVo<ScmTransferRecordsVo> pv = scmTransferRecordsService.pagerList(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean saveRecords(ScmTransferRecordsDto dto) {
return scmTransferRecordsService.saveRecords(dto);
}
@Override
public ResultBean<ScmRecordsInvoiceVo> getInvoiceInfo(String sid) {
return scmTransferRecordsService.getInvoiceInfo(sid);
}
@Override
public ResultBean<ScmTransferRecords> selectByVinSid(String vinSid, String receiveUserSid) {
return scmTransferRecordsService.selectByVinSid(vinSid, receiveUserSid);
}
}

46
doc/databases/bus-center_tables.sql

@ -863,3 +863,49 @@ CREATE TABLE `bus_arrears_carry_vehicle_details`
) ENGINE = INNODB
DEFAULT CHARSET = utf8 COMMENT ='欠款提车车辆信息';
DROP TABLE IF EXISTS `bus_transfer_records`;
CREATE TABLE `bus_transfer_records`
(
`id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
`sid` varchar(64) NOT NULL COMMENT 'sid',
`lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
`isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
`state` int(32) DEFAULT '1' COMMENT '状态',
`isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
`remarks` varchar(255) DEFAULT NULL COMMENT '备注',
`createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
`updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
`goodsSid` varchar(64) DEFAULT NULL COMMENT '移交物品sid',
`goodsName` varchar(64) DEFAULT NULL COMMENT '移交物品名称',
`goodsType` varchar(64) DEFAULT NULL COMMENT '移交物品类别',
`goodsTypeKey` varchar(64) DEFAULT NULL COMMENT '移交物品类别Key',
`contractNo` varchar(200) DEFAULT NULL COMMENT '合同编号',
`vinNo` varchar(64) DEFAULT NULL COMMENT '车架号',
`vinSid` varchar(64) DEFAULT NULL COMMENT '车辆sid',
`transferNum` int(32) DEFAULT NULL COMMENT '移交数量',
`goodsUnit` varchar(200) DEFAULT NULL COMMENT '物品单位',
`transferSid` varchar(64) DEFAULT NULL COMMENT '移交人sid',
`transferName` varchar(64) DEFAULT NULL COMMENT '移交人',
`transferDeptSid` varchar(64) DEFAULT NULL COMMENT '移交部门sid',
`transferDept` varchar(64) DEFAULT NULL COMMENT '移交部门',
`transferRemarks` text DEFAULT NULL COMMENT '移交备注',
`transferFiles` text DEFAULT NULL COMMENT '移交附件',
`receiveRoleSid` varchar(64) DEFAULT NULL COMMENT '接收角色sid',
`receiveSid` varchar(64) DEFAULT NULL COMMENT '接收人sid',
`receiveName` varchar(64) DEFAULT NULL COMMENT '接收人',
`receiveDeptSid` varchar(64) DEFAULT NULL COMMENT '接收部门sid',
`receiveDept` varchar(64) DEFAULT NULL COMMENT '接收部门',
`receiveState` int(32) DEFAULT NULL COMMENT '接收状态:0待接收,1已接收',
`receiveTime` timestamp null DEFAULT NULL COMMENT '接收时间',
`receiveFiles` text DEFAULT NULL COMMENT '接收附件',
`useOrgSid` varchar(255) DEFAULT NULL COMMENT '使用组织sid',
`useOrgName` varchar(255) DEFAULT NULL COMMENT '使用组织名称',
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB
DEFAULT CHARSET = utf8 COMMENT ='物品移交记录表';

44
doc/databases/scm_tables.sql

@ -933,48 +933,6 @@ CREATE TABLE `scm_vehicle_gression_veh`
) ENGINE = INNODB
DEFAULT CHARSET = utf8 COMMENT ='移位申请单车架号库';
DROP TABLE IF EXISTS `scm_transfer_records`;
CREATE TABLE `scm_transfer_records`
(
`id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
`sid` varchar(64) NOT NULL COMMENT 'sid',
`lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
`isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
`state` int(32) DEFAULT '1' COMMENT '状态',
`isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
`remarks` varchar(255) DEFAULT NULL COMMENT '备注',
`createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
`updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
`goodsSid` varchar(64) DEFAULT NULL COMMENT '移交物品sid',
`goodsName` varchar(64) DEFAULT NULL COMMENT '移交物品名称',
`goodsType` varchar(64) DEFAULT NULL COMMENT '移交物品类别',
`goodsTypeKey` varchar(64) DEFAULT NULL COMMENT '移交物品类别Key',
`contractNo` varchar(200) DEFAULT NULL COMMENT '合同编号',
`vinNo` varchar(64) DEFAULT NULL COMMENT '车架号',
`vinSid` varchar(64) DEFAULT NULL COMMENT '车辆sid',
`transferNum` int(32) DEFAULT NULL COMMENT '移交数量',
`goodsUnit` varchar(200) DEFAULT NULL COMMENT '物品单位',
`transferSid` varchar(64) DEFAULT NULL COMMENT '移交人sid',
`transferName` varchar(64) DEFAULT NULL COMMENT '移交人',
`transferDeptSid` varchar(64) DEFAULT NULL COMMENT '移交部门sid',
`transferDept` varchar(64) DEFAULT NULL COMMENT '移交部门',
`transferRemarks` text DEFAULT NULL COMMENT '移交备注',
`transferFiles` text DEFAULT NULL COMMENT '移交附件',
`receiveRoleSid` varchar(64) DEFAULT NULL COMMENT '接收角色sid',
`receiveSid` varchar(64) DEFAULT NULL COMMENT '接收人sid',
`receiveName` varchar(64) DEFAULT NULL COMMENT '接收人',
`receiveDeptSid` varchar(64) DEFAULT NULL COMMENT '接收部门sid',
`receiveDept` varchar(64) DEFAULT NULL COMMENT '接收部门',
`receiveState` int(32) DEFAULT NULL COMMENT '接收状态:0待接收,1已接收',
`receiveTime` timestamp null DEFAULT NULL COMMENT '接收时间',
`receiveFiles` text DEFAULT NULL COMMENT '接收附件',
`useOrgSid` varchar(255) DEFAULT NULL COMMENT '使用组织sid',
`useOrgName` varchar(255) DEFAULT NULL COMMENT '使用组织名称',
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB
DEFAULT CHARSET = utf8 COMMENT ='物品移交记录表';

Loading…
Cancel
Save