Browse Source

调车开票申请接口开发。

采购订单状态根据日期赋值。
master
God 3 years ago
parent
commit
01d9a3b8a8
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVeh.java
  2. 35
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehDetailsVo.java
  3. 35
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehDto.java
  4. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehQuery.java
  5. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehVo.java
  6. 27
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDetailsVo.java
  7. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDto.java
  8. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeign.java
  9. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeignFallback.java
  10. 42
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingByVehQuery.java
  11. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
  12. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehMapper.java
  13. 48
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehMapper.xml
  14. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehService.java
  15. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.java
  16. 16
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.xml
  17. 25
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyRest.java
  18. 85
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
  19. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
  20. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVeh.java

@ -52,8 +52,8 @@ import java.math.BigDecimal;
public class BaseShuntingInvoicinApplyeVeh extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("调sid")
private String accadjSid; // 调账sid
@ApiModelProperty("调车开票sid")
private String mainSid; // 调车开票sid
@ApiModelProperty("调车车辆表sid")
private String purchaseSid; // 调车车辆表sid
@ApiModelProperty("合格证")

35
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehDetailsVo.java

@ -53,8 +53,8 @@ public class BaseShuntingInvoicinApplyeVehDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("调sid")
private String accadjSid; // 调账sid
@ApiModelProperty("调车开票sid")
private String mainSid; // 调车开票sid
@ApiModelProperty("调车车辆表sid")
private String purchaseSid; // 调车车辆表sid
@ApiModelProperty("合格证")
@ -65,5 +65,34 @@ public class BaseShuntingInvoicinApplyeVehDetailsVo implements Vo {
private String invoicinCompanySid; // 开票单位sid
@ApiModelProperty("开票单位名称")
private String invoicinCompanyName; // 开票单位名称
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型别名")
private String vehicleAlias; // 车型别名
@ApiModelProperty("常用配置sid")
private String configSid; // 常用配置sid
@ApiModelProperty("常用配置名称")
private String configName; // 常用配置名称
@ApiModelProperty("运费")
private String freight; // 运费
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("库存地点sid")
private String inventoryLocationSid; // 库存地点sid
@ApiModelProperty("库存地点名称")
private String inventoryLocationName; // 库存地点名称
@ApiModelProperty("内销价格")
private String witPinMoney; // 内销价格
@ApiModelProperty("发票类型key")
private String invoiceTypeKey; // 发票类型key
@ApiModelProperty("发票类型value")
private String invoiceTypeValue; // 发票类型value
@ApiModelProperty("运费承担方sid")
private String freightUndertakerSid; // 运费承担方sid
@ApiModelProperty("运费承担方名称")
private String freightUndertakerName; // 运费承担方名称
@ApiModelProperty("是否调账(0未调账,1已调账)")
private String isAccadj; // 是否调账(0未调账,1已调账)
@ApiModelProperty("是否开票(0未开票,1已开票)")
private String isInvoicing; // 是否开票(0未开票,1已开票)
}

35
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehDto.java

@ -53,8 +53,8 @@ public class BaseShuntingInvoicinApplyeVehDto implements Dto {
private String sid; // sid
@ApiModelProperty("调sid")
private String accadjSid; // 调账sid
@ApiModelProperty("调车开票sid")
private String mainSid; // 调车开票sid
@ApiModelProperty("调车车辆表sid")
private String purchaseSid; // 调车车辆表sid
@ApiModelProperty("合格证")
@ -65,5 +65,34 @@ public class BaseShuntingInvoicinApplyeVehDto implements Dto {
private String invoicinCompanySid; // 开票单位sid
@ApiModelProperty("开票单位名称")
private String invoicinCompanyName; // 开票单位名称
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型别名")
private String vehicleAlias; // 车型别名
@ApiModelProperty("常用配置sid")
private String configSid; // 常用配置sid
@ApiModelProperty("常用配置名称")
private String configName; // 常用配置名称
@ApiModelProperty("运费")
private String freight; // 运费
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("库存地点sid")
private String inventoryLocationSid; // 库存地点sid
@ApiModelProperty("库存地点名称")
private String inventoryLocationName; // 库存地点名称
@ApiModelProperty("内销价格")
private String witPinMoney; // 内销价格
@ApiModelProperty("发票类型key")
private String invoiceTypeKey; // 发票类型key
@ApiModelProperty("发票类型value")
private String invoiceTypeValue; // 发票类型value
@ApiModelProperty("运费承担方sid")
private String freightUndertakerSid; // 运费承担方sid
@ApiModelProperty("运费承担方名称")
private String freightUndertakerName; // 运费承担方名称
@ApiModelProperty("是否调账(0未调账,1已调账)")
private String isAccadj; // 是否调账(0未调账,1已调账)
@ApiModelProperty("是否开票(0未开票,1已开票)")
private String isInvoicing; // 是否开票(0未开票,1已开票)
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehQuery.java

@ -51,8 +51,8 @@ import java.math.BigDecimal;
@ApiModel(value = "调车开票申请车辆表 查询条件", description = "调车开票申请车辆表 查询条件")
public class BaseShuntingInvoicinApplyeVehQuery implements Query {
@ApiModelProperty("调sid")
private String accadjSid; // 调账sid
@ApiModelProperty("调车开票sid")
private String mainSid; // 调车开票sid
@ApiModelProperty("调车车辆表sid")
private String purchaseSid; // 调车车辆表sid
@ApiModelProperty("合格证")

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehVo.java

@ -53,8 +53,8 @@ public class BaseShuntingInvoicinApplyeVehVo implements Vo {
private String sid; // sid
@ApiModelProperty("调sid")
private String accadjSid; // 调账sid
@ApiModelProperty("调车开票sid")
private String mainSid; // 调车开票sid
@ApiModelProperty("调车车辆表sid")
private String purchaseSid; // 调车车辆表sid
@ApiModelProperty("合格证")

27
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDetailsVo.java

@ -26,12 +26,16 @@
package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDetailsVo;
import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDto;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-base(调车开票) <br/>
* File: BaseShuntingInvoicingApplyVo.java <br/>
@ -51,12 +55,6 @@ public class BaseShuntingInvoicingApplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("申请日期")
private String applyDate; // 申请日期
@ApiModelProperty("调账类型key")
private String accadjTypeKey; // 调账类型key
@ApiModelProperty("调账类型value")
private String accadjTypeValue; // 调账类型value
@ApiModelProperty("调出分公司sid")
private String callOutOrgSid; // 调出分公司sid
@ApiModelProperty("调出分公司名称")
@ -65,19 +63,6 @@ public class BaseShuntingInvoicingApplyDetailsVo implements Vo {
private String callInOrgSid; // 调入分公司sid
@ApiModelProperty("调入分公司名称")
private String callInOrgName; // 调入分公司名称
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("调车开票车辆列表")
private List<BaseShuntingInvoicinApplyeVehDetailsVo> baseShuntingInvoicinApplyeVehs; // 调车开票车辆列表
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDto.java

@ -26,12 +26,15 @@
package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-base(调车开票) <br/>
* File: BaseShuntingInvoicingApplyDto.java <br/>
@ -79,5 +82,6 @@ public class BaseShuntingInvoicingApplyDto implements Dto {
private String nodeState; // 流程状态
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("调车开票车辆列表")
private List<BaseShuntingInvoicinApplyeVehDto> baseShuntingInvoicinApplyeVehs; // 调车开票车辆列表
}

8
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeign.java

@ -25,6 +25,8 @@
*********************************************************/
package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyByVehQuery;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
@ -75,4 +77,10 @@ public interface BaseShuntingInvoicingApplyFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<BaseShuntingInvoicingApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("调车开票申请选择车辆列表")
@PostMapping("/fetchVeh")
@ResponseBody
public ResultBean<PagerVo<BaseInternalPurchaseVehicleDetailsVo>> fetchVeh(@RequestBody PagerQuery<BaseShuntingInvoicingByVehQuery> pq);
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeignFallback.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -69,4 +70,9 @@ public class BaseShuntingInvoicingApplyFeignFallback implements BaseShuntingInvo
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/baseshuntinginvoicingapply/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<PagerVo<BaseInternalPurchaseVehicleDetailsVo>> fetchVeh(PagerQuery<BaseShuntingInvoicingByVehQuery> pq) {
return null;
}
}

42
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingByVehQuery.java

@ -0,0 +1,42 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "调车申请表 查询条件", description = "调车申请表 查询条件")
public class BaseShuntingInvoicingByVehQuery implements Query {
@ApiModelProperty("调出分公司sid")
private String callOutOrgSid; // 调出分公司sid
@ApiModelProperty("调入分公司sid")
private String callInOrgSid; // 调入分公司sid
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@ -233,7 +233,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
listDto.setOrderType("排产订单");
listDto.setOrderTypeKey("001");
listDto.setInsideCode(vo.getInsideCode());
listDto.setOrderStatus("0");
listDto.setOrderStatus("待办");
dtoList.add(listDto);
}
busVehicleOrderService.saveVehicleOrder(dtoList);

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehMapper.java

@ -29,6 +29,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDetailsVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -62,4 +64,9 @@ public interface BaseShuntingInvoicinApplyeVehMapper extends BaseMapper<BaseShun
@Select("select * from base_shunting_invoicin_applye_veh")
List<BaseShuntingInvoicinApplyeVehVo> selectListVo();
@Delete("delete from base_shunting_invoicin_applye_veh where mainSid = #{dtoSid}")
void delByMainSid(String dtoSid);
List<BaseShuntingInvoicinApplyeVehDetailsVo> fetchByMainSid(String sid);
}

48
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehMapper.xml

@ -1,13 +1,43 @@
<?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.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehVo">
SELECT * FROM base_shunting_invoicin_applye_veh <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehVo">
SELECT * FROM base_shunting_invoicin_applye_veh <where> ${ew.sqlSegment} </where>
</select>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo"
resultType="com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehVo">
SELECT * FROM base_shunting_invoicin_applye_veh
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo"
resultType="com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehVo">
SELECT * FROM base_shunting_invoicin_applye_veh
<where>
${ew.sqlSegment}
</where>
</select>
<select id="fetchByMainSid"
resultType="com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDetailsVo">
SELECT bsiav.sid,
bipv.`mainSid`,
bipv.`vehicleAlias`,
bipv.`configSid`,
bipv.`configName`,
bsiav.`certificate`,
bipv.`vinNo`,
bipv.`witPinMoney`,
bipv.invoiceTypeKey,
bipv.invoiceTypeValue,
bsiav.invoicinMoney,
bsiav.invoicinCompanySid,
bsiav.invoicinCompanyName,
bsiav.`remarks`
FROM base_shunting_invoicin_applye_veh bsiav
LEFT JOIN base_internal_purchase_vehicle bipv
ON bsiav.`purchaseSid` = bipv.`sid`
WHERE mainSid = #{sid}
</select>
</mapper>

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehService.java

@ -107,4 +107,12 @@ public class BaseShuntingInvoicinApplyeVehService extends MybatisBaseService<Bas
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
public List<BaseShuntingInvoicinApplyeVehDetailsVo> fetchByMainSid(String sid) {
return baseMapper.fetchByMainSid(sid);
}
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.java

@ -26,9 +26,11 @@
package com.yxt.anrui.base.biz.baseshuntinginvoicingapply;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -62,4 +64,6 @@ public interface BaseShuntingInvoicingApplyMapper extends BaseMapper<BaseShuntin
@Select("select * from base_shunting_invoicing_apply")
List<BaseShuntingInvoicingApplyVo> selectListVo();
IPage<BaseInternalPurchaseVehicleDetailsVo> fetchVeh(IPage<BaseInternalPurchaseVehicleDetailsVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseInternalPurchaseVehicleDetailsVo> qw);
}

16
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.xml

@ -10,4 +10,20 @@
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyVo">
SELECT * FROM base_shunting_invoicing_apply <where> ${ew.sqlSegment} </where>
</select>
<select id="fetchVeh"
resultType="com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo">
SELECT
bipv.*,
bip.`shuntingType`,
bip.`buyerOrgName`,
bip.`buyerOrgSid`,
bip.`sellerOrgName`,
bip.`sellerOrgSid`
FROM
base_internal_purchase_vehicle bipv
LEFT JOIN base_internal_purchase bip
ON bipv.`mainSid` = bip.`sid`
<where> ${ew.sqlSegment} </where>
</select>
</mapper>

25
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyRest.java

@ -25,6 +25,8 @@
*********************************************************/
package com.yxt.anrui.base.biz.baseshuntinginvoicingapply;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -34,12 +36,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApply;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyQuery;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyVo;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyDetailsVo;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyDto;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyFeign;
/**
* Project: anrui-base(调车开票) <br/>
@ -75,26 +71,25 @@ public class BaseShuntingInvoicingApplyRest implements BaseShuntingInvoicingAppl
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseShuntingInvoicingApplyDto dto){
ResultBean rb = ResultBean.fireFail();
baseShuntingInvoicingApplyService.saveOrUpdateDto(dto);
return rb.success();
return baseShuntingInvoicingApplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
baseShuntingInvoicingApplyService.delBySids(sids);
return rb.success();
return baseShuntingInvoicingApplyService.delAll(sids);
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<BaseShuntingInvoicingApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
BaseShuntingInvoicingApplyDetailsVo vo = baseShuntingInvoicingApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
return baseShuntingInvoicingApplyService.fetchDetailsVoBySid(sid);
}
@Override
public ResultBean<PagerVo<BaseInternalPurchaseVehicleDetailsVo>> fetchVeh(PagerQuery<BaseShuntingInvoicingByVehQuery> pq) {
return baseShuntingInvoicingApplyService.fetchVeh(pq);
}
}

85
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java

@ -28,19 +28,22 @@ package com.yxt.anrui.base.biz.baseshuntinginvoicingapply;
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.base.api.baseaccadjapply.BaseAccadjApplyByVehQuery;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDetailsVo;
import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDto;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.*;
import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
import com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApply;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyQuery;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyVo;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyDetailsVo;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyDto;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@ -60,6 +63,12 @@ import java.util.List;
*/
@Service
public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseShuntingInvoicingApplyMapper, BaseShuntingInvoicingApply> {
@Autowired
private BaseShuntingInvoicinApplyeVehService baseShuntingInvoicinApplyeVehService;
@Autowired
private BaseInternalPurchaseVehicleService baseInternalPurchaseVehicleService;
private QueryWrapper<BaseShuntingInvoicingApply> createQueryWrapper(BaseShuntingInvoicingApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -85,19 +94,36 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
return p;
}
public void saveOrUpdateDto(BaseShuntingInvoicingApplyDto dto) {
public ResultBean saveOrUpdateDto(BaseShuntingInvoicingApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
List<BaseShuntingInvoicinApplyeVehDto> baseShuntingInvoicinApplyeVehs = dto.getBaseShuntingInvoicinApplyeVehs();
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
if (StringUtils.isBlank(dtoSid)) {//新增
String s = this.insertByDto(dto);
for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) {
baseShuntingInvoicinApplyeVeh.setMainSid(s);
baseShuntingInvoicinApplyeVehService.insertByDto(baseShuntingInvoicinApplyeVeh);
}
return rb.success().setMsg("保存成功");
}
BaseShuntingInvoicingApply baseShuntingInvoicingApply = fetchBySid(dtoSid);
if (baseShuntingInvoicingApply == null) {
return rb.setMsg("该调车申请单不存在");
}
this.updateByDto(dto);
baseShuntingInvoicinApplyeVehService.delByMainSid(dtoSid);
for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) {
baseShuntingInvoicinApplyeVeh.setMainSid(dtoSid);
baseShuntingInvoicinApplyeVehService.insertByDto(baseShuntingInvoicinApplyeVeh);
}
return rb.success().setMsg("修改成功");
}
public void insertByDto(BaseShuntingInvoicingApplyDto dto) {
public String insertByDto(BaseShuntingInvoicingApplyDto dto) {
BaseShuntingInvoicingApply entity = new BaseShuntingInvoicingApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return entity.getSid();
}
public void updateByDto(BaseShuntingInvoicingApplyDto dto) {
@ -110,10 +136,43 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
baseMapper.updateById(entity);
}
public BaseShuntingInvoicingApplyDetailsVo fetchDetailsVoBySid(String sid) {
public ResultBean<BaseShuntingInvoicingApplyDetailsVo> fetchDetailsVoBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
BaseShuntingInvoicingApply entity = fetchBySid(sid);
BaseShuntingInvoicingApplyDetailsVo vo = new BaseShuntingInvoicingApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
List<BaseShuntingInvoicinApplyeVehDetailsVo> baseShuntingInvoicinApplyeVehDetailsVos = baseShuntingInvoicinApplyeVehService.fetchByMainSid(sid);
vo.setBaseShuntingInvoicinApplyeVehs(baseShuntingInvoicinApplyeVehDetailsVos);
return rb.success().setData(vo);
}
public ResultBean<PagerVo<BaseInternalPurchaseVehicleDetailsVo>> fetchVeh(PagerQuery<BaseShuntingInvoicingByVehQuery> pq) {
ResultBean rb = ResultBean.fireFail();
BaseShuntingInvoicingByVehQuery query = pq.getParams();
QueryWrapper<BaseInternalPurchaseVehicleDetailsVo> qw = new QueryWrapper<>();
String callInOrgSid = query.getCallInOrgSid();
String callOutOrgSid = query.getCallOutOrgSid();
if (StringUtils.isBlank(callInOrgSid)) {
return rb.setMsg("请选择调入分公司");
}
if (StringUtils.isBlank(callOutOrgSid)) {
return rb.setMsg("请选择调出分公司");
}
qw.eq("bip.shuntingType", "调入");
qw.eq("bip.buyerOrgSid", callInOrgSid);
qw.eq("bip.sellerOrgSid", callOutOrgSid);
IPage<BaseInternalPurchaseVehicleDetailsVo> page = PagerUtil.queryToPage(pq);
IPage<BaseInternalPurchaseVehicleDetailsVo> pagging = baseMapper.fetchVeh(page, qw);
PagerVo<BaseInternalPurchaseVehicleDetailsVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
delBySids(sids);
for (String sid : sids) {
baseShuntingInvoicinApplyeVehService.delByMainSid(sid);
}
return rb.success().setMsg("删除成功");
}
}

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@ -224,11 +224,11 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
//预上线日期
String expectLaunchDate = dto.getExpectLaunchDate();
if (StringUtils.isNotBlank(offlineDate)) {
vehicleOrder.setOrderStatus("3");
vehicleOrder.setOrderStatus("下线");
} else if (StringUtils.isNotBlank(launchDate)) {
vehicleOrder.setOrderStatus("2");
vehicleOrder.setOrderStatus("上线");
} else if (StringUtils.isNotBlank(expectLaunchDate)) {
vehicleOrder.setOrderStatus("1");
vehicleOrder.setOrderStatus("未上线");
}
updateById(vehicleOrder);
if (StringUtils.isNotBlank(offlineDate)) {

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

@ -396,11 +396,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
baseVehicleDto.setVehicleStateValue("在途");
baseVehicleDto.setManPurOrderTypeKey("001");
baseVehicleDto.setManPurOrderTypeValue("排产订单");
baseVehicleDto.setContractPrice(Integer.parseInt(dto.getContractPrice().toString()));
baseVehicleDto.setFreight(Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString()));
baseVehicleDto.setCostPriced(Integer.parseInt(dto.getCostPrice().toString()));
baseVehicleDto.setPriceDate(dto.getPriceDate());
baseVehicleDto.setDepartureDate(dto.getDepartureDate());
//baseVehicleDto.setContractPrice(Integer.parseInt(dto.getContractPrice().toString()));
//baseVehicleDto.setFreight(Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString()));
//baseVehicleDto.setCostPriced(Integer.parseInt(dto.getCostPrice().toString()));
//baseVehicleDto.setPriceDate(dto.getPriceDate());
//baseVehicleDto.setDepartureDate(dto.getDepartureDate());
baseVehicleDtos.add(baseVehicleDto);
}
baseVehicleFeign.saveAll(baseVehicleDtos);

Loading…
Cancel
Save