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

Merge remote-tracking branch 'origin/master'

master
God 3 years ago
parent
82b3b7ad33 473bbb065e
commit
8fa26c8f5f
33 changed files with 1270 additions and 1316 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. 263
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java
  2. 325
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderDto.java
  3. 16
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java
  4. 11
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java
  5. 351
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java
  6. 309
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java
  7. 44
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/VehicleOrderListVo.java
  8. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java
  9. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
  10. 42
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java
  11. 117
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
  12. 57
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java
  13. 80
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
  14. 50
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeign.java
  15. 48
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeignFallback.java
  16. 38
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundListVo.java
  17. 32
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java
  18. 68
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
  19. 36
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicle.java
  20. 43
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleDto.java
  21. 37
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleFeign.java
  22. 31
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleFeignFallback.java
  23. 33
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleQuery.java
  24. 38
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java
  25. 41
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.java
  26. 17
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.xml
  27. 58
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java
  28. 154
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  29. 39
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.java
  30. 20
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.xml
  31. 46
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleRest.java
  32. 118
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleService.java
  33. BIN
      工作计划/安瑞信息化平台工作内容.xlsx

263
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java
View File

@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(车型信息) <br/>
@ -45,6 +46,7 @@ import io.swagger.annotations.ApiModelProperty;
*/
@ApiModel(value = "车辆采购订单", description = "车辆采购订单")
@TableName("bus_vehicle_order")
@Data
public class BusVehicleOrder extends BaseEntity {
private static final long serialVersionUID = 1L;
@ -108,265 +110,4 @@ public class BusVehicleOrder extends BaseEntity {
@ApiModelProperty("订单状态")
private String orderStatus; // 订单状态
/**
* @return 创建组织sid
*/
public String getCreateOrgSid(){
return createOrgSid;
}
/**
* @param createOrgSid 创建组织sid to set
*/
public void setCreateOrgSid(String createOrgSid){
this.createOrgSid = createOrgSid;
}
/**
* @return 订单编号
*/
public String getOrderNo(){
return orderNo;
}
/**
* @param orderNo 订单编号 to set
*/
public void setOrderNo(String orderNo){
this.orderNo = orderNo;
}
/**
* @return 订单类型
*/
public String getOrderType(){
return orderType;
}
/**
* @param orderType 订单类型 to set
*/
public void setOrderType(String orderType){
this.orderType = orderType;
}
/**
* @return 订单日期
*/
public String getOrderDate(){
return orderDate;
}
/**
* @param orderDate 订单日期 to set
*/
public void setOrderDate(String orderDate){
this.orderDate = orderDate;
}
/**
* @return 排产/采购申请sid
*/
public String getPurchaseRequisitionSid(){
return purchaseRequisitionSid;
}
/**
* @param purchaseRequisitionSid 排产/采购申请sid to set
*/
public void setPurchaseRequisitionSid(String purchaseRequisitionSid){
this.purchaseRequisitionSid = purchaseRequisitionSid;
}
/**
* @return 排产/采购申请中车型表sid
*/
public String getPurchaseApplyMediumModelSid(){
return purchaseApplyMediumModelSid;
}
/**
* @param purchaseApplyMediumModelSid 排产/采购申请中车型表sid to set
*/
public void setPurchaseApplyMediumModelSid(String purchaseApplyMediumModelSid){
this.purchaseApplyMediumModelSid = purchaseApplyMediumModelSid;
}
/**
* @return 台数
*/
public String getPlatformNo(){
return platformNo;
}
/**
* @param platformNo 台数 to set
*/
public void setPlatformNo(String platformNo){
this.platformNo = platformNo;
}
/**
* @return 底盘价格构成
*/
public String getChassisPriceComposition(){
return chassisPriceComposition;
}
/**
* @param chassisPriceComposition 底盘价格构成 to set
*/
public void setChassisPriceComposition(String chassisPriceComposition){
this.chassisPriceComposition = chassisPriceComposition;
}
/**
* @return 底盘结算价格
*/
public String getChassisSettlementPrice(){
return chassisSettlementPrice;
}
/**
* @param chassisSettlementPrice 底盘结算价格 to set
*/
public void setChassisSettlementPrice(String chassisSettlementPrice){
this.chassisSettlementPrice = chassisSettlementPrice;
}
/**
* @return 上装价格
*/
public String getCoatPrice(){
return coatPrice;
}
/**
* @param coatPrice 上装价格 to set
*/
public void setCoatPrice(String coatPrice){
this.coatPrice = coatPrice;
}
/**
* @return 修订差价
*/
public String getRevisedPriceDifference(){
return revisedPriceDifference;
}
/**
* @param revisedPriceDifference 修订差价 to set
*/
public void setRevisedPriceDifference(String revisedPriceDifference){
this.revisedPriceDifference = revisedPriceDifference;
}
/**
* @return 入库价格
*/
public String getTreasuryPrice(){
return treasuryPrice;
}
/**
* @param treasuryPrice 入库价格 to set
*/
public void setTreasuryPrice(String treasuryPrice){
this.treasuryPrice = treasuryPrice;
}
/**
* @return 运费
*/
public String getFreight(){
return freight;
}
/**
* @param freight 运费 to set
*/
public void setFreight(String freight){
this.freight = freight;
}
/**
* @return 销售指导价
*/
public String getSalesGuidePrice(){
return salesGuidePrice;
}
/**
* @param salesGuidePrice 销售指导价 to set
*/
public void setSalesGuidePrice(String salesGuidePrice){
this.salesGuidePrice = salesGuidePrice;
}
/**
* @return 收到发票日期
*/
public String getReceivedInvoiceDate(){
return receivedInvoiceDate;
}
/**
* @param receivedInvoiceDate 收到发票日期 to set
*/
public void setReceivedInvoiceDate(String receivedInvoiceDate){
this.receivedInvoiceDate = receivedInvoiceDate;
}
/**
* @return 发票金额
*/
public String getInvoiceAmount(){
return invoiceAmount;
}
/**
* @param invoiceAmount 发票金额 to set
*/
public void setInvoiceAmount(String invoiceAmount){
this.invoiceAmount = invoiceAmount;
}
/**
* @return 预计上线日期
*/
public String getExpectLaunchDate(){
return expectLaunchDate;
}
/**
* @param expectLaunchDate 预计上线日期 to set
*/
public void setExpectLaunchDate(String expectLaunchDate){
this.expectLaunchDate = expectLaunchDate;
}
/**
* @return 上线日期
*/
public String getLaunchDate(){
return launchDate;
}
/**
* @param launchDate 上线日期 to set
*/
public void setLaunchDate(String launchDate){
this.launchDate = launchDate;
}
/**
* @return 下线日期
*/
public String getOfflineDate(){
return offlineDate;
}
/**
* @param offlineDate 下线日期 to set
*/
public void setOfflineDate(String offlineDate){
this.offlineDate = offlineDate;
}
/**
* @return 订单状态
*/
public String getOrderStatus(){
return orderStatus;
}
/**
* @param orderStatus 订单状态 to set
*/
public void setOrderStatus(String orderStatus){
this.orderStatus = orderStatus;
}
}

325
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderDto.java
View File

@ -26,9 +26,16 @@
package com.yxt.anrui.base.api.busvehicleorder;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import com.yxt.common.core.utils.desensitized.Sensitive;
import com.yxt.common.core.utils.desensitized.SensitiveTypeEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
/**
* Project: anrui-base(车型信息) <br/>
@ -44,8 +51,11 @@ import io.swagger.annotations.ApiModelProperty;
* @since 1.0
*/
@ApiModel(value = "车辆采购订单 数据传输对象", description = "车辆采购订单 数据传输对象")
@Data
public class BusVehicleOrderDto implements Dto {
@ApiModelProperty("采购订单sid")
private String sid;
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ -54,337 +64,56 @@ public class BusVehicleOrderDto implements Dto {
private String orderNo; // 订单编号
@ApiModelProperty("订单类型")
@NotBlank(message = "订单类型不能为空")
private String orderType; // 订单类型
@ApiModelProperty("订单日期")
@Pattern(regexp = "^(\\s*)|([1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]))$", message = "订单日期格式不正确")
private String orderDate; // 订单日期
@ApiModelProperty("排产/采购申请sid")
private String purchaseRequisitionSid; // 排产/采购申请sid
@ApiModelProperty("排产/采购申请中车型表sid")
@NotBlank(message = "车型表sid不能为空")
private String purchaseApplyMediumModelSid; // 排产/采购申请中车型表sid
@ApiModelProperty("台数")
@NotBlank(message = "台数不能为空")
@Pattern(regexp = "^(\\s*)|([1-9]\\d*)$", message = "台数输入不正确")
private String platformNo; // 台数
@ApiModelProperty("底盘价格构成")
private String chassisPriceComposition; // 底盘价格构成
@ApiModelProperty("底盘结算价格")
private String chassisSettlementPrice; // 底盘结算价格
@ApiModelProperty("上装价格")
@Pattern(regexp = "^(\\s*)|(([1-9][0-9]*)|(([0]\\.\\d{0,2}|[1-9][0-9]*\\.\\d{0,2})))$", message = "上装价格格式输入不正确")
private String coatPrice; // 上装价格
@ApiModelProperty("修订差价")
private String revisedPriceDifference; // 修订差价
@ApiModelProperty("入库价格")
private String treasuryPrice; // 入库价格
@Pattern(regexp = "^(\\s*)|(([1-9][0-9]*)|(([0]\\.\\d{0,2}|[1-9][0-9]*\\.\\d{0,2})))$", message = "入库价格格式输入不正确")
private String treasuryPrice; // 入库价格
@ApiModelProperty("运费")
@Pattern(regexp = "^(\\s*)|(([1-9][0-9]*)|(([0]\\.\\d{0,2}|[1-9][0-9]*\\.\\d{0,2})))$", message = "运费格式输入不正确")
private String freight; // 运费
@ApiModelProperty("销售指导价")
@Pattern(regexp = "^(\\s*)|(([1-9][0-9]*)|(([0]\\.\\d{0,2}|[1-9][0-9]*\\.\\d{0,2})))$", message = "销售指导价格式输入不正确")
private String salesGuidePrice; // 销售指导价
@ApiModelProperty("收到发票日期")
private String receivedInvoiceDate; // 收到发票日期
@ApiModelProperty("发票金额")
private String invoiceAmount; // 发票金额
@ApiModelProperty("预计上线日期")
@Pattern(regexp = "^(\\s*)|([1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]))$", message = "预计上线日期格式不正确")
private String expectLaunchDate; // 预计上线日期
@ApiModelProperty("上线日期")
@Pattern(regexp = "^(\\s*)|([1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]))$", message = "上线日期格式不正确")
private String launchDate; // 上线日期
@ApiModelProperty("下线日期")
@Pattern(regexp = "^(\\s*)|([1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]))$", message = "下线日期格式不正确")
private String offlineDate; // 下线日期
@ApiModelProperty("排产申请编号")
private String applicationCode;
@ApiModelProperty("订单状态")
private String orderStatus; // 订单状态
/**
* @return 创建组织sid
*/
public String getCreateOrgSid(){
return createOrgSid;
}
/**
* @param createOrgSid 创建组织sid to set
*/
public void setCreateOrgSid(String createOrgSid){
this.createOrgSid = createOrgSid;
}
/**
* @return 订单编号
*/
public String getOrderNo(){
return orderNo;
}
/**
* @param orderNo 订单编号 to set
*/
public void setOrderNo(String orderNo){
this.orderNo = orderNo;
}
/**
* @return 订单类型
*/
public String getOrderType(){
return orderType;
}
/**
* @param orderType 订单类型 to set
*/
public void setOrderType(String orderType){
this.orderType = orderType;
}
/**
* @return 订单日期
*/
public String getOrderDate(){
return orderDate;
}
/**
* @param orderDate 订单日期 to set
*/
public void setOrderDate(String orderDate){
this.orderDate = orderDate;
}
/**
* @return 排产/采购申请sid
*/
public String getPurchaseRequisitionSid(){
return purchaseRequisitionSid;
}
/**
* @param purchaseRequisitionSid 排产/采购申请sid to set
*/
public void setPurchaseRequisitionSid(String purchaseRequisitionSid){
this.purchaseRequisitionSid = purchaseRequisitionSid;
}
/**
* @return 排产/采购申请中车型表sid
*/
public String getPurchaseApplyMediumModelSid(){
return purchaseApplyMediumModelSid;
}
/**
* @param purchaseApplyMediumModelSid 排产/采购申请中车型表sid to set
*/
public void setPurchaseApplyMediumModelSid(String purchaseApplyMediumModelSid){
this.purchaseApplyMediumModelSid = purchaseApplyMediumModelSid;
}
/**
* @return 台数
*/
public String getPlatformNo(){
return platformNo;
}
/**
* @param platformNo 台数 to set
*/
public void setPlatformNo(String platformNo){
this.platformNo = platformNo;
}
/**
* @return 底盘价格构成
*/
public String getChassisPriceComposition(){
return chassisPriceComposition;
}
/**
* @param chassisPriceComposition 底盘价格构成 to set
*/
public void setChassisPriceComposition(String chassisPriceComposition){
this.chassisPriceComposition = chassisPriceComposition;
}
/**
* @return 底盘结算价格
*/
public String getChassisSettlementPrice(){
return chassisSettlementPrice;
}
/**
* @param chassisSettlementPrice 底盘结算价格 to set
*/
public void setChassisSettlementPrice(String chassisSettlementPrice){
this.chassisSettlementPrice = chassisSettlementPrice;
}
/**
* @return 上装价格
*/
public String getCoatPrice(){
return coatPrice;
}
/**
* @param coatPrice 上装价格 to set
*/
public void setCoatPrice(String coatPrice){
this.coatPrice = coatPrice;
}
/**
* @return 修订差价
*/
public String getRevisedPriceDifference(){
return revisedPriceDifference;
}
/**
* @param revisedPriceDifference 修订差价 to set
*/
public void setRevisedPriceDifference(String revisedPriceDifference){
this.revisedPriceDifference = revisedPriceDifference;
}
/**
* @return 入库价格
*/
public String getTreasuryPrice(){
return treasuryPrice;
}
/**
* @param treasuryPrice 入库价格 to set
*/
public void setTreasuryPrice(String treasuryPrice){
this.treasuryPrice = treasuryPrice;
}
/**
* @return 运费
*/
public String getFreight(){
return freight;
}
/**
* @param freight 运费 to set
*/
public void setFreight(String freight){
this.freight = freight;
}
/**
* @return 销售指导价
*/
public String getSalesGuidePrice(){
return salesGuidePrice;
}
/**
* @param salesGuidePrice 销售指导价 to set
*/
public void setSalesGuidePrice(String salesGuidePrice){
this.salesGuidePrice = salesGuidePrice;
}
/**
* @return 收到发票日期
*/
public String getReceivedInvoiceDate(){
return receivedInvoiceDate;
}
/**
* @param receivedInvoiceDate 收到发票日期 to set
*/
public void setReceivedInvoiceDate(String receivedInvoiceDate){
this.receivedInvoiceDate = receivedInvoiceDate;
}
/**
* @return 发票金额
*/
public String getInvoiceAmount(){
return invoiceAmount;
}
/**
* @param invoiceAmount 发票金额 to set
*/
public void setInvoiceAmount(String invoiceAmount){
this.invoiceAmount = invoiceAmount;
}
/**
* @return 预计上线日期
*/
public String getExpectLaunchDate(){
return expectLaunchDate;
}
/**
* @param expectLaunchDate 预计上线日期 to set
*/
public void setExpectLaunchDate(String expectLaunchDate){
this.expectLaunchDate = expectLaunchDate;
}
/**
* @return 上线日期
*/
public String getLaunchDate(){
return launchDate;
}
/**
* @param launchDate 上线日期 to set
*/
public void setLaunchDate(String launchDate){
this.launchDate = launchDate;
}
/**
* @return 下线日期
*/
public String getOfflineDate(){
return offlineDate;
}
/**
* @param offlineDate 下线日期 to set
*/
public void setOfflineDate(String offlineDate){
this.offlineDate = offlineDate;
}
/**
* @return 订单状态
*/
public String getOrderStatus(){
return orderStatus;
}
/**
* @param orderStatus 订单状态 to set
*/
public void setOrderStatus(String orderStatus){
this.orderStatus = orderStatus;
}
}

16
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java
View File

@ -34,6 +34,8 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
/**
* Project: anrui-base(车型信息) <br/>
* File: BusVehicleOrderFeign.java <br/>
@ -57,22 +59,18 @@ public interface BusVehicleOrderFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BusVehicleOrderVo>> listPage(@RequestBody PagerQuery<BusVehicleOrderQuery> pq);
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody BusVehicleOrderDto dto);
public ResultBean<PagerVo<VehicleOrderListVo>> listPage(@RequestBody PagerQuery<BusVehicleOrderQuery> pq);
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody BusVehicleOrderDto dto, @PathVariable("sid") String sid);
@ApiOperation("新增或修改车辆采购订单")
@PostMapping("/saveOrUpdateVehicleOrder")
public ResultBean saveOrUpdateVehicleOrder(@RequestBody @Valid BusVehicleOrderDto dto);
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@ApiOperation("根据sid查询车辆采购订单")
@GetMapping("/fetchBySid/{sid}")
public ResultBean<BusVehicleOrderVo> fetchBySid(@PathVariable("sid") String sid);

11
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java
View File

@ -48,19 +48,14 @@ import org.springframework.stereotype.Component;
public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign {
@Override
public ResultBean<PagerVo<BusVehicleOrderVo>> listPage(PagerQuery<BusVehicleOrderQuery> pq) {
public ResultBean listPage(PagerQuery<BusVehicleOrderQuery> pq) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/busvehicleorder/listPage无法访问");
}
@Override
public ResultBean save(BusVehicleOrderDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleorder/save无法访问");
}
@Override
public ResultBean update(BusVehicleOrderDto dto, String sid) {
return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleorder/update无法访问");
public ResultBean saveOrUpdateVehicleOrder(BusVehicleOrderDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleorder/saveOrUpdateVehicleOrder无法访问");
}

351
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java
View File

@ -29,6 +29,7 @@ package com.yxt.anrui.base.api.busvehicleorder;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(车型信息) <br/>
@ -44,347 +45,25 @@ import io.swagger.annotations.ApiModelProperty;
* @since 1.0
*/
@ApiModel(value = "车辆采购订单 查询条件", description = "车辆采购订单 查询条件")
@Data
public class BusVehicleOrderQuery implements Query {
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("订单编号")
private String orderNo; // 订单编号
@ApiModelProperty("订单类型")
private String orderType; // 订单类型
@ApiModelProperty("订单日期")
private String orderDate; // 订单日期
@ApiModelProperty("排产/采购申请sid")
private String purchaseRequisitionSid; // 排产/采购申请sid
@ApiModelProperty("排产/采购申请中车型表sid")
private String purchaseApplyMediumModelSid; // 排产/采购申请中车型表sid
@ApiModelProperty("台数")
private String platformNo; // 台数
@ApiModelProperty("底盘价格构成")
private String chassisPriceComposition; // 底盘价格构成
@ApiModelProperty("底盘结算价格")
private String chassisSettlementPrice; // 底盘结算价格
@ApiModelProperty("上装价格")
private String coatPrice; // 上装价格
@ApiModelProperty("修订差价")
private String revisedPriceDifference; // 修订差价
@ApiModelProperty("入库价格")
private String treasuryPrice; // 入库价格
@ApiModelProperty("运费")
private String freight; // 运费
@ApiModelProperty("销售指导价")
private String salesGuidePrice; // 销售指导价
@ApiModelProperty("收到发票日期")
private String receivedInvoiceDate; // 收到发票日期
@ApiModelProperty("发票金额")
private String invoiceAmount; // 发票金额
@ApiModelProperty("预计上线日期")
private String expectLaunchDate; // 预计上线日期
@ApiModelProperty("上线日期")
private String launchDate; // 上线日期
private String orderNo;
@ApiModelProperty("订单类型")
private String orderType;
@ApiModelProperty("订单状态")
private String orderStatus;
@ApiModelProperty("下线日期")
private String offlineDate; // 下线日期
@ApiModelProperty("开始日期")
private String startDate;
@ApiModelProperty("订单状态")
private String orderStatus; // 订单状态
@ApiModelProperty("结束日期")
private String endDate;
/**
* @return 创建组织sid
*/
public String getCreateOrgSid(){
return createOrgSid;
}
/**
* @param createOrgSid 创建组织sid to set
*/
public void setCreateOrgSid(String createOrgSid){
this.createOrgSid = createOrgSid;
}
/**
* @return 订单编号
*/
public String getOrderNo(){
return orderNo;
}
/**
* @param orderNo 订单编号 to set
*/
public void setOrderNo(String orderNo){
this.orderNo = orderNo;
}
/**
* @return 订单类型
*/
public String getOrderType(){
return orderType;
}
/**
* @param orderType 订单类型 to set
*/
public void setOrderType(String orderType){
this.orderType = orderType;
}
/**
* @return 订单日期
*/
public String getOrderDate(){
return orderDate;
}
/**
* @param orderDate 订单日期 to set
*/
public void setOrderDate(String orderDate){
this.orderDate = orderDate;
}
/**
* @return 排产/采购申请sid
*/
public String getPurchaseRequisitionSid(){
return purchaseRequisitionSid;
}
/**
* @param purchaseRequisitionSid 排产/采购申请sid to set
*/
public void setPurchaseRequisitionSid(String purchaseRequisitionSid){
this.purchaseRequisitionSid = purchaseRequisitionSid;
}
/**
* @return 排产/采购申请中车型表sid
*/
public String getPurchaseApplyMediumModelSid(){
return purchaseApplyMediumModelSid;
}
/**
* @param purchaseApplyMediumModelSid 排产/采购申请中车型表sid to set
*/
public void setPurchaseApplyMediumModelSid(String purchaseApplyMediumModelSid){
this.purchaseApplyMediumModelSid = purchaseApplyMediumModelSid;
}
/**
* @return 台数
*/
public String getPlatformNo(){
return platformNo;
}
/**
* @param platformNo 台数 to set
*/
public void setPlatformNo(String platformNo){
this.platformNo = platformNo;
}
/**
* @return 底盘价格构成
*/
public String getChassisPriceComposition(){
return chassisPriceComposition;
}
/**
* @param chassisPriceComposition 底盘价格构成 to set
*/
public void setChassisPriceComposition(String chassisPriceComposition){
this.chassisPriceComposition = chassisPriceComposition;
}
/**
* @return 底盘结算价格
*/
public String getChassisSettlementPrice(){
return chassisSettlementPrice;
}
/**
* @param chassisSettlementPrice 底盘结算价格 to set
*/
public void setChassisSettlementPrice(String chassisSettlementPrice){
this.chassisSettlementPrice = chassisSettlementPrice;
}
/**
* @return 上装价格
*/
public String getCoatPrice(){
return coatPrice;
}
/**
* @param coatPrice 上装价格 to set
*/
public void setCoatPrice(String coatPrice){
this.coatPrice = coatPrice;
}
/**
* @return 修订差价
*/
public String getRevisedPriceDifference(){
return revisedPriceDifference;
}
/**
* @param revisedPriceDifference 修订差价 to set
*/
public void setRevisedPriceDifference(String revisedPriceDifference){
this.revisedPriceDifference = revisedPriceDifference;
}
/**
* @return 入库价格
*/
public String getTreasuryPrice(){
return treasuryPrice;
}
/**
* @param treasuryPrice 入库价格 to set
*/
public void setTreasuryPrice(String treasuryPrice){
this.treasuryPrice = treasuryPrice;
}
/**
* @return 运费
*/
public String getFreight(){
return freight;
}
/**
* @param freight 运费 to set
*/
public void setFreight(String freight){
this.freight = freight;
}
/**
* @return 销售指导价
*/
public String getSalesGuidePrice(){
return salesGuidePrice;
}
/**
* @param salesGuidePrice 销售指导价 to set
*/
public void setSalesGuidePrice(String salesGuidePrice){
this.salesGuidePrice = salesGuidePrice;
}
/**
* @return 收到发票日期
*/
public String getReceivedInvoiceDate(){
return receivedInvoiceDate;
}
/**
* @param receivedInvoiceDate 收到发票日期 to set
*/
public void setReceivedInvoiceDate(String receivedInvoiceDate){
this.receivedInvoiceDate = receivedInvoiceDate;
}
/**
* @return 发票金额
*/
public String getInvoiceAmount(){
return invoiceAmount;
}
/**
* @param invoiceAmount 发票金额 to set
*/
public void setInvoiceAmount(String invoiceAmount){
this.invoiceAmount = invoiceAmount;
}
/**
* @return 预计上线日期
*/
public String getExpectLaunchDate(){
return expectLaunchDate;
}
/**
* @param expectLaunchDate 预计上线日期 to set
*/
public void setExpectLaunchDate(String expectLaunchDate){
this.expectLaunchDate = expectLaunchDate;
}
/**
* @return 上线日期
*/
public String getLaunchDate(){
return launchDate;
}
/**
* @param launchDate 上线日期 to set
*/
public void setLaunchDate(String launchDate){
this.launchDate = launchDate;
}
/**
* @return 下线日期
*/
public String getOfflineDate(){
return offlineDate;
}
/**
* @param offlineDate 下线日期 to set
*/
public void setOfflineDate(String offlineDate){
this.offlineDate = offlineDate;
}
/**
* @return 订单状态
*/
public String getOrderStatus(){
return orderStatus;
}
/**
* @param orderStatus 订单状态 to set
*/
public void setOrderStatus(String orderStatus){
this.orderStatus = orderStatus;
}
@ApiModelProperty("车型")
private String modelName;
}

309
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java
View File

@ -29,6 +29,7 @@ package com.yxt.anrui.base.api.busvehicleorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(车型信息) <br/>
@ -44,6 +45,7 @@ import io.swagger.annotations.ApiModelProperty;
* @since 1.0
*/
@ApiModel(value = "车辆采购订单 视图数据对象", description = "车辆采购订单 视图数据对象")
@Data
public class BusVehicleOrderVo implements Vo {
@ -68,18 +70,9 @@ public class BusVehicleOrderVo implements Vo {
@ApiModelProperty("台数")
private String platformNo; // 台数
@ApiModelProperty("底盘价格构成")
private String chassisPriceComposition; // 底盘价格构成
@ApiModelProperty("底盘结算价格")
private String chassisSettlementPrice; // 底盘结算价格
@ApiModelProperty("上装价格")
private String coatPrice; // 上装价格
@ApiModelProperty("修订差价")
private String revisedPriceDifference; // 修订差价
@ApiModelProperty("入库价格")
private String treasuryPrice; // 入库价格
@ -89,302 +82,18 @@ public class BusVehicleOrderVo implements Vo {
@ApiModelProperty("销售指导价")
private String salesGuidePrice; // 销售指导价
@ApiModelProperty("收到发票日期")
private String receivedInvoiceDate; // 收到发票日期
@ApiModelProperty("发票金额")
private String invoiceAmount; // 发票金额
@ApiModelProperty("预计上线日期")
private String expectLaunchDate; // 预计上线日期
@ApiModelProperty("上线日期")
@ApiModelProperty("上线日期")
private String launchDate; // 上线日期
@ApiModelProperty("下线日期")
@ApiModelProperty("下线日期")
private String offlineDate; // 下线日期
@ApiModelProperty("排产申请编号")
private String applicationCode;
@ApiModelProperty("订单状态")
private String orderStatus; // 订单状态
/**
* @return 创建组织sid
*/
public String getCreateOrgSid(){
return createOrgSid;
}
/**
* @param createOrgSid 创建组织sid to set
*/
public void setCreateOrgSid(String createOrgSid){
this.createOrgSid = createOrgSid;
}
/**
* @return 订单编号
*/
public String getOrderNo(){
return orderNo;
}
/**
* @param orderNo 订单编号 to set
*/
public void setOrderNo(String orderNo){
this.orderNo = orderNo;
}
/**
* @return 订单类型
*/
public String getOrderType(){
return orderType;
}
/**
* @param orderType 订单类型 to set
*/
public void setOrderType(String orderType){
this.orderType = orderType;
}
/**
* @return 订单日期
*/
public String getOrderDate(){
return orderDate;
}
/**
* @param orderDate 订单日期 to set
*/
public void setOrderDate(String orderDate){
this.orderDate = orderDate;
}
/**
* @return 排产/采购申请sid
*/
public String getPurchaseRequisitionSid(){
return purchaseRequisitionSid;
}
/**
* @param purchaseRequisitionSid 排产/采购申请sid to set
*/
public void setPurchaseRequisitionSid(String purchaseRequisitionSid){
this.purchaseRequisitionSid = purchaseRequisitionSid;
}
/**
* @return 排产/采购申请中车型表sid
*/
public String getPurchaseApplyMediumModelSid(){
return purchaseApplyMediumModelSid;
}
/**
* @param purchaseApplyMediumModelSid 排产/采购申请中车型表sid to set
*/
public void setPurchaseApplyMediumModelSid(String purchaseApplyMediumModelSid){
this.purchaseApplyMediumModelSid = purchaseApplyMediumModelSid;
}
/**
* @return 台数
*/
public String getPlatformNo(){
return platformNo;
}
/**
* @param platformNo 台数 to set
*/
public void setPlatformNo(String platformNo){
this.platformNo = platformNo;
}
/**
* @return 底盘价格构成
*/
public String getChassisPriceComposition(){
return chassisPriceComposition;
}
/**
* @param chassisPriceComposition 底盘价格构成 to set
*/
public void setChassisPriceComposition(String chassisPriceComposition){
this.chassisPriceComposition = chassisPriceComposition;
}
/**
* @return 底盘结算价格
*/
public String getChassisSettlementPrice(){
return chassisSettlementPrice;
}
/**
* @param chassisSettlementPrice 底盘结算价格 to set
*/
public void setChassisSettlementPrice(String chassisSettlementPrice){
this.chassisSettlementPrice = chassisSettlementPrice;
}
/**
* @return 上装价格
*/
public String getCoatPrice(){
return coatPrice;
}
/**
* @param coatPrice 上装价格 to set
*/
public void setCoatPrice(String coatPrice){
this.coatPrice = coatPrice;
}
/**
* @return 修订差价
*/
public String getRevisedPriceDifference(){
return revisedPriceDifference;
}
/**
* @param revisedPriceDifference 修订差价 to set
*/
public void setRevisedPriceDifference(String revisedPriceDifference){
this.revisedPriceDifference = revisedPriceDifference;
}
/**
* @return 入库价格
*/
public String getTreasuryPrice(){
return treasuryPrice;
}
/**
* @param treasuryPrice 入库价格 to set
*/
public void setTreasuryPrice(String treasuryPrice){
this.treasuryPrice = treasuryPrice;
}
/**
* @return 运费
*/
public String getFreight(){
return freight;
}
/**
* @param freight 运费 to set
*/
public void setFreight(String freight){
this.freight = freight;
}
/**
* @return 销售指导价
*/
public String getSalesGuidePrice(){
return salesGuidePrice;
}
/**
* @param salesGuidePrice 销售指导价 to set
*/
public void setSalesGuidePrice(String salesGuidePrice){
this.salesGuidePrice = salesGuidePrice;
}
/**
* @return 收到发票日期
*/
public String getReceivedInvoiceDate(){
return receivedInvoiceDate;
}
/**
* @param receivedInvoiceDate 收到发票日期 to set
*/
public void setReceivedInvoiceDate(String receivedInvoiceDate){
this.receivedInvoiceDate = receivedInvoiceDate;
}
/**
* @return 发票金额
*/
public String getInvoiceAmount(){
return invoiceAmount;
}
/**
* @param invoiceAmount 发票金额 to set
*/
public void setInvoiceAmount(String invoiceAmount){
this.invoiceAmount = invoiceAmount;
}
/**
* @return 预计上线日期
*/
public String getExpectLaunchDate(){
return expectLaunchDate;
}
/**
* @param expectLaunchDate 预计上线日期 to set
*/
public void setExpectLaunchDate(String expectLaunchDate){
this.expectLaunchDate = expectLaunchDate;
}
/**
* @return 上线日期
*/
public String getLaunchDate(){
return launchDate;
}
/**
* @param launchDate 上线日期 to set
*/
public void setLaunchDate(String launchDate){
this.launchDate = launchDate;
}
/**
* @return 下线日期
*/
public String getOfflineDate(){
return offlineDate;
}
/**
* @param offlineDate 下线日期 to set
*/
public void setOfflineDate(String offlineDate){
this.offlineDate = offlineDate;
}
/**
* @return 订单状态
*/
public String getOrderStatus(){
return orderStatus;
}
/**
* @param orderStatus 订单状态 to set
*/
public void setOrderStatus(String orderStatus){
this.orderStatus = orderStatus;
}
}

44
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/VehicleOrderListVo.java
View File

@ -0,0 +1,44 @@
package com.yxt.anrui.base.api.busvehicleorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author liuguohui
* @version 1.0
* @description
* @date 2022/04/01
*/
@ApiModel("采购订单列表")
@Data
public class VehicleOrderListVo implements Vo {
@ApiModelProperty("订单状态")
private String orderStatus;
@ApiModelProperty("订单编号")
private String orderNo;
@ApiModelProperty("订单日期")
private String orderDate;
@ApiModelProperty("订单类型")
private String orderType;
@ApiModelProperty("车型")
private String modelName;
@ApiModelProperty("台数")
private String platformNo;
@ApiModelProperty("预计上线日期")
private String expectLaunchDate;
@ApiModelProperty("上线日期")
private String launchDate;
@ApiModelProperty("下线日期")
private String offlineDate;
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java
View File

@ -59,7 +59,7 @@ public interface BusVehicleOrderMapper extends BaseMapper<BusVehicleOrder> {
//@Update("update bus_vehicle_order set name=#{msg} where id=#{id}")
//IPage<BusVehicleOrderVo> voPage(IPage<BusVehicleOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusVehicleOrder> qw);
IPage<BusVehicleOrderVo> selectPageVo(IPage<BusVehicleOrder> page, @Param(Constants.WRAPPER) Wrapper<BusVehicleOrder> qw);
IPage<VehicleOrderListVo> selectPageVo(IPage<BusVehicleOrder> page, @Param(Constants.WRAPPER) Wrapper<BusVehicleOrder> qw);
List<BusVehicleOrderVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusVehicleOrder> qw);
@ -103,4 +103,6 @@ public interface BusVehicleOrderMapper extends BaseMapper<BusVehicleOrder> {
* @return
*/
AppCurrentCarDetailVo getAppProductionSchedulingDetailConfigVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
BusVehicleOrderVo selectBySid(@Param("sid") String sid);
}

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
View File

@ -3,9 +3,12 @@
<mapper namespace="com.yxt.anrui.base.biz.busvehicleorder.BusVehicleOrderMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo">
SELECT *
FROM bus_vehicle_order
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.busvehicleorder.VehicleOrderListVo">
SELECT bvo.*,bvm.modelName
FROM bus_vehicle_order bvo
LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid=bvm.sid
LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid
LEFT JOIN bus_vehicle_apply bva ON bvad.applySid=bva.sid
<where>
${ew.sqlSegment}
</where>
@ -161,4 +164,15 @@
WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid}
</select>
<select id="selectBySid" resultType="com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo">
SELECT bvo.createOrgSid,bvo.orderNo,bvo.orderType,bvo.orderDate,bvo.purchaseApplyMediumModelSid,bvo.platformNo,bvo.coatPrice,
bvo.treasuryPrice,bvo.freight,bvo.salesGuidePrice,bvo.expectLaunchDate,bvo.launchDate,bvo.offlineDate,bvo.orderStatus,bvm.modelName,
bva.applicationCode
FROM bus_vehicle_order bvo
LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid=bvm.sid
LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid
LEFT JOIN bus_vehicle_apply bva ON bvad.applySid=bva.sid
WHERE bvo.sid=#{sid}
</select>
</mapper>

42
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java
View File

@ -28,12 +28,14 @@ package com.yxt.anrui.base.biz.busvehicleorder;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailCongfigVo;
import com.yxt.anrui.base.api.busvehicleorder.*;
import com.yxt.common.base.utils.DateUtils;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -59,47 +61,35 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
private BusVehicleOrderService busVehicleOrderService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BusVehicleOrderVo>> listPage(@RequestBody PagerQuery<BusVehicleOrderQuery> pq) {
public ResultBean<PagerVo<VehicleOrderListVo>> listPage(PagerQuery<BusVehicleOrderQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<BusVehicleOrderVo> pv = busVehicleOrderService.listPageVo(pq);
PagerVo<VehicleOrderListVo> pv = busVehicleOrderService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody BusVehicleOrderDto dto) {
ResultBean rb = ResultBean.fireFail();
busVehicleOrderService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody BusVehicleOrderDto dto, @PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
busVehicleOrderService.updateBySid(dto.toMap(), sid);
return rb.success();
public ResultBean saveOrUpdateVehicleOrder(BusVehicleOrderDto dto) {
if (StringUtils.isNotBlank(dto.getLaunchDate()) && StringUtils.isNotBlank(dto.getOfflineDate())) {
long launchTime = DateUtils.dateStrConvertDate(dto.getLaunchDate(), "yyyy-MM-dd").getTime();
long OfflineTime = DateUtils.dateStrConvertDate(dto.getOfflineDate(), "yyyy-MM-dd").getTime();
if (launchTime > OfflineTime) {
return new ResultBean().setMsg("下线日期不能小于上线日期");
}
}
return busVehicleOrderService.saveOrUpdateVehicleOrder(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) {
public ResultBean delBySids(String[] sids) {
ResultBean rb = ResultBean.fireFail();
busVehicleOrderService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchBySid/{sid}")
public ResultBean<BusVehicleOrderVo> fetchBySid(@PathVariable("sid") String sid) {
public ResultBean<BusVehicleOrderVo> fetchBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
BusVehicleOrder vo = busVehicleOrderService.fetchBySid(sid);
BusVehicleOrderVo vo = busVehicleOrderService.selectBySid(sid);
return rb.success().setData(vo);
}

117
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
View File

@ -38,8 +38,10 @@ import com.yxt.anrui.base.api.busvehicleorder.*;
import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.DateUtils;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -47,6 +49,7 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/**
@ -95,95 +98,38 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusVehicleOrder> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getCreateOrgSid())) {
qw.eq("createOrgSid", query.getCreateOrgSid());
}
if (StringUtils.isNotBlank(query.getOrderNo())) {
qw.eq("orderNo", query.getOrderNo());
qw.like("bvo.orderNo", query.getOrderNo());
}
if (StringUtils.isNotBlank(query.getOrderType())) {
qw.eq("orderType", query.getOrderType());
}
if (StringUtils.isNotBlank(query.getOrderDate())) {
qw.eq("orderDate", query.getOrderDate());
}
if (StringUtils.isNotBlank(query.getPurchaseRequisitionSid())) {
qw.eq("purchaseRequisitionSid", query.getPurchaseRequisitionSid());
}
if (StringUtils.isNotBlank(query.getPurchaseApplyMediumModelSid())) {
qw.eq("purchaseApplyMediumModelSid", query.getPurchaseApplyMediumModelSid());
}
if (StringUtils.isNotBlank(query.getPlatformNo())) {
qw.eq("platformNo", query.getPlatformNo());
}
if (StringUtils.isNotBlank(query.getChassisPriceComposition())) {
qw.eq("chassisPriceComposition", query.getChassisPriceComposition());
}
if (StringUtils.isNotBlank(query.getChassisSettlementPrice())) {
qw.eq("chassisSettlementPrice", query.getChassisSettlementPrice());
qw.like("bvo.orderType", query.getOrderType());
}
if (StringUtils.isNotBlank(query.getCoatPrice())) {
qw.eq("coatPrice", query.getCoatPrice());
}
if (StringUtils.isNotBlank(query.getRevisedPriceDifference())) {
qw.eq("revisedPriceDifference", query.getRevisedPriceDifference());
}
if (StringUtils.isNotBlank(query.getTreasuryPrice())) {
qw.eq("treasuryPrice", query.getTreasuryPrice());
}
if (StringUtils.isNotBlank(query.getFreight())) {
qw.eq("freight", query.getFreight());
}
if (StringUtils.isNotBlank(query.getSalesGuidePrice())) {
qw.eq("salesGuidePrice", query.getSalesGuidePrice());
}
if (StringUtils.isNotBlank(query.getReceivedInvoiceDate())) {
qw.eq("receivedInvoiceDate", query.getReceivedInvoiceDate());
}
if (StringUtils.isNotBlank(query.getInvoiceAmount())) {
qw.eq("invoiceAmount", query.getInvoiceAmount());
if (StringUtils.isNotBlank(query.getOrderStatus())) {
qw.like("bvo.orderStatus", query.getOrderStatus());
}
if (StringUtils.isNotBlank(query.getExpectLaunchDate())) {
qw.eq("expectLaunchDate", query.getExpectLaunchDate());
if (StringUtils.isNotBlank(query.getModelName())) {
qw.like("bvm.modelName", query.getModelName());
}
if (StringUtils.isNotBlank(query.getLaunchDate())) {
qw.eq("launchDate", query.getLaunchDate());
if (StringUtils.isNotBlank(query.getStartDate())) {
qw.gt("bva.applicationDate", query.getStartDate());
}
if (StringUtils.isNotBlank(query.getOfflineDate())) {
qw.eq("offlineDate", query.getOfflineDate());
}
if (StringUtils.isNotBlank(query.getOrderStatus())) {
qw.eq("orderStatus", query.getOrderStatus());
if (StringUtils.isNotBlank(query.getEndDate())) {
qw.lt("bva.applicationDate", query.getEndDate());
}
return qw;
}
public PagerVo<BusVehicleOrderVo> listPageVo(PagerQuery<BusVehicleOrderQuery> pq) {
public PagerVo<VehicleOrderListVo> listPageVo(PagerQuery<BusVehicleOrderQuery> pq) {
BusVehicleOrderQuery query = pq.getParams();
QueryWrapper<BusVehicleOrder> qw = createQueryWrapper(query);
IPage<BusVehicleOrder> page = PagerUtil.queryToPage(pq);
IPage<BusVehicleOrderVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BusVehicleOrderVo> p = PagerUtil.pageToVo(pagging, null);
IPage<VehicleOrderListVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<VehicleOrderListVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@ -196,10 +142,33 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
return baseMapper.selectListVo();
}
public void saveOrUpdateDto(BusVehicleOrderDto dto) {
BusVehicleOrder entity = new BusVehicleOrder();
dto.fillEntity(entity);
this.saveOrUpdate(entity);
/**
* 保存或修改采购订单
* @param dto
*/
public ResultBean saveOrUpdateVehicleOrder(BusVehicleOrderDto dto) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(dto.getSid())) { // 新增
BusVehicleOrder vehicleOrder = new BusVehicleOrder();
BeanUtil.copyProperties(dto, vehicleOrder);
vehicleOrder.setSid(UUID.randomUUID().toString());
save(vehicleOrder);
return rb.success();
} else { // 修改
BusVehicleOrder vehicleOrder = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, vehicleOrder);
updateById(vehicleOrder);
return rb.success();
}
}
/**
* 根据sid查询车辆采购订单
* @param sid
* @return
*/
public BusVehicleOrderVo selectBySid(String sid) {
return baseMapper.selectBySid(sid);
}
public BusVehicleOrderVo fetchByIdVo(String id) {

57
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java
View File

@ -0,0 +1,57 @@
package com.yxt.anrui.scm.api.scmapplyinbound;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInbound.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInbound <br/>
* Description: 车辆入账单. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 11:54:35 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "车辆入账单", description = "车辆入账单")
@TableName("scm_apply_inbound")
@Data
public class ScmApplyInbound extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("申请编号")
private String applicationCode;
@ApiModelProperty("申请人sid")
private String applicationSid;
@ApiModelProperty("申请人名称")
private String applicationName;
@ApiModelProperty("申请日期")
private String applicationDate;
@ApiModelProperty("采购订单sid")
private String vehicleOrderSid;
@ApiModelProperty("采购订单编号")
private String purchaseOrderNo;
@ApiModelProperty("车型sid ")
private String modelSid;
@ApiModelProperty("车型名称 ")
private String modelName;
@ApiModelProperty("常用配置 ")
private String configName;
@ApiModelProperty("厂家发车日期")
private String departureDate;
}

80
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
View File

@ -0,0 +1,80 @@
package com.yxt.anrui.scm.api.scmapplyinbound;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.util.List;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundDto.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundDto <br/>
* Description: 车辆入账单 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 11:54:35 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "车辆入账单 数据传输对象", description = "车辆入账单 数据传输对象")
@Data
public class ScmApplyInboundDto implements Dto {
@ApiModelProperty("车辆入账单sid")
private String sid;
@ApiModelProperty("申请编号")
@NotBlank(message = "申请编号不能为空")
private String applicationCode;
@ApiModelProperty("申请人sid")
@NotBlank(message = "申请人不能为空")
private String applicationSid;
@ApiModelProperty("申请人名称")
@NotBlank(message = "申请人不能为空")
private String applicationName;
@ApiModelProperty("申请日期")
@Pattern(regexp = "^(\\s*)|([1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]))$", message = "申请日期日期格式不正确")
private String applicationDate;
@ApiModelProperty("采购订单sid")
@NotBlank(message = "采购订单不能为空")
private String vehicleOrderSid;
@ApiModelProperty("采购订单编号")
@NotBlank(message = "采购订单编号不能为空")
private String purchaseOrderNo;
@ApiModelProperty("车型sid ")
@NotBlank(message = "车型不能为空")
private String modelSid;
@ApiModelProperty("车型名称 ")
@NotBlank(message = "车型名称不能为空")
private String modelName;
@ApiModelProperty("常用配置 ")
@NotBlank(message = "常用配置不能为空")
private String configName;
@ApiModelProperty("厂家发车日期")
private String departureDate;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("车辆列表")
private List<ScmApplyInboundVehicleDto> vehicleList;
}

50
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeign.java
View File

@ -0,0 +1,50 @@
package com.yxt.anrui.scm.api.scmapplyinbound;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundFeign.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundFeign <br/>
* Description: 车辆入账单. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 11:54:35 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "车辆入账单")
@FeignClient(
contextId = "anrui-scm-ScmApplyInbound",
name = "anrui-scm",
path = "v1/scmapplyinbound",
fallback = ScmApplyInboundFeignFallback.class)
public interface ScmApplyInboundFeign {
@ApiOperation("根据条件分页查询车辆入账单的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmApplyInboundListVo>> listPage(@RequestBody PagerQuery<ScmApplyInboundQuery> pq);
@ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll")
public ResultBean<List<ScmApplyInboundVo>> listAll(@RequestBody ScmApplyInboundQuery query);
@ApiOperation("新增和修改车辆入账单")
@PostMapping("/saveOrUpdateApplyInBound")
public ResultBean saveOrUpdateApplyInBound(@RequestBody @Valid ScmApplyInboundDto dto);
@ApiOperation("根据sid查询车辆入账单详情")
@GetMapping("/fetchSid/{sid}")
public ResultBean<ScmApplyInboundVo> fetchSid(@PathVariable("sid") String sid);
}

48
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeignFallback.java
View File

@ -0,0 +1,48 @@
package com.yxt.anrui.scm.api.scmapplyinbound;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundFeignFallback <br/>
* Description: 车辆入账单. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 11:54:35 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class ScmApplyInboundFeignFallback implements ScmApplyInboundFeign {
@Override
public ResultBean listPage(PagerQuery<ScmApplyInboundQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmapplyinbound/listPage无法访问");
}
@Override
public ResultBean<List<ScmApplyInboundVo>> listAll(ScmApplyInboundQuery query){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmapplyinbound/listAll无法访问");
}
@Override
public ResultBean saveOrUpdateApplyInBound(ScmApplyInboundDto dto){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmapplyinbound/save无法访问");
}
@Override
public ResultBean<ScmApplyInboundVo> fetchSid(String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmapplyinbound/fetchSid无法访问");
}
}

38
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundListVo.java
View File

@ -0,0 +1,38 @@
package com.yxt.anrui.scm.api.scmapplyinbound;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author liuguohui
* @version 1.0
* @description
* @date 2022/04/02
*/
@ApiModel("入账申请列表")
@Data
public class ScmApplyInboundListVo implements Vo {
@ApiModelProperty("车辆入账单sid")
private String sid;
@ApiModelProperty("申请编号")
private String applicationCode;
@ApiModelProperty("申请日期")
private String applicationDate;
@ApiModelProperty("采购订单编号")
private String purchaseOrderNo;
@ApiModelProperty("车型名称 ")
private String modelName;
@ApiModelProperty("台数 ")
private String vehicleNum;
@ApiModelProperty("状态 ")
private String nodeState;
}

32
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java
View File

@ -0,0 +1,32 @@
package com.yxt.anrui.scm.api.scmapplyinbound;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundQuery.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundQuery <br/>
* Description: 车辆入账单 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 11:54:35 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "车辆入账单 查询条件", description = "车辆入账单 查询条件")
@Data
public class ScmApplyInboundQuery implements Query {
@ApiModelProperty("采购订单编号")
private String purchaseOrderNo;
@ApiModelProperty("车型")
private String modelName;
}

68
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
View File

@ -0,0 +1,68 @@
package com.yxt.anrui.scm.api.scmapplyinbound;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
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-scm(进销存) <br/>
* File: ScmApplyInboundVo.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo <br/>
* Description: 车辆入账单 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 11:54:35 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "车辆入账单 视图数据对象", description = "车辆入账单 视图数据对象")
@Data
public class ScmApplyInboundVo implements Vo {
@ApiModelProperty("车辆入账单sid")
private String sid;
@ApiModelProperty("申请编号")
private String applicationCode;
@ApiModelProperty("申请人sid")
private String applicationSid;
@ApiModelProperty("申请人名称")
private String applicationName;
@ApiModelProperty("申请日期")
private String applicationDate;
@ApiModelProperty("采购订单sid")
private String vehicleOrderSid;
@ApiModelProperty("采购订单编号")
private String purchaseOrderNo;
@ApiModelProperty("车型sid ")
private String modelSid;
@ApiModelProperty("车型名称 ")
private String modelName;
@ApiModelProperty("常用配置 ")
private String configName;
@ApiModelProperty("厂家发车日期")
private String departureDate;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("车辆列表")
private List<ScmApplyInboundVehicleVo> inboundVehicleList;
}

36
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicle.java
View File

@ -0,0 +1,36 @@
package com.yxt.anrui.scm.api.scmapplyinboundvehicle;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundVehicle.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle <br/>
* Description: 入库车辆信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 12:00:53 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "入库车辆信息", description = "入库车辆信息")
@TableName("scm_apply_inbound_vehicle")
@Data
public class ScmApplyInboundVehicle extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("车辆入库单sid")
private String applySid;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("车架号(VIN)")
private String vinNo;
}

43
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleDto.java
View File

@ -0,0 +1,43 @@
package com.yxt.anrui.scm.api.scmapplyinboundvehicle;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundVehicleDto.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto <br/>
* Description: 入库车辆信息 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 12:00:53 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "入库车辆信息 数据传输对象", description = "入库车辆信息 数据传输对象")
@Data
public class ScmApplyInboundVehicleDto implements Dto {
@ApiModelProperty("车辆信息sid")
private String sid;
@ApiModelProperty("车辆入库单sid")
private String applySid;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("车架号(VIN)")
private String vinNo;
@ApiModelProperty("备注")
private String remarks;
}

37
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleFeign.java
View File

@ -0,0 +1,37 @@
package com.yxt.anrui.scm.api.scmapplyinboundvehicle;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundVehicleFeign.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleFeign <br/>
* Description: 入库车辆信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 12:00:53 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "入库车辆信息")
@FeignClient(
contextId = "anrui-scm-ScmApplyInboundVehicle",
name = "anrui-scm",
path = "v1/scmapplyinboundvehicle",
fallback = ScmApplyInboundVehicleFeignFallback.class)
public interface ScmApplyInboundVehicleFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmApplyInboundVehicleVo>> listPage(@RequestBody PagerQuery<ScmApplyInboundVehicleQuery> pq);
}

31
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleFeignFallback.java
View File

@ -0,0 +1,31 @@
package com.yxt.anrui.scm.api.scmapplyinboundvehicle;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundVehicleFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleFeignFallback <br/>
* Description: 入库车辆信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 12:00:53 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class ScmApplyInboundVehicleFeignFallback implements ScmApplyInboundVehicleFeign {
@Override
public ResultBean<PagerVo<ScmApplyInboundVehicleVo>> listPage(PagerQuery<ScmApplyInboundVehicleQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmapplyinboundvehicle/listPage无法访问");
}
}

33
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleQuery.java
View File

@ -0,0 +1,33 @@
package com.yxt.anrui.scm.api.scmapplyinboundvehicle;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundVehicleQuery.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleQuery <br/>
* Description: 入库车辆信息 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 12:00:53 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "入库车辆信息 查询条件", description = "入库车辆信息 查询条件")
@Data
public class ScmApplyInboundVehicleQuery implements Query {
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("车架号(VIN)")
private String vinNo;
}

38
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java
View File

@ -0,0 +1,38 @@
package com.yxt.anrui.scm.api.scmapplyinboundvehicle;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundVehicleVo.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo <br/>
* Description: 入库车辆信息 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 12:00:53 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "入库车辆信息 视图数据对象", description = "入库车辆信息 视图数据对象")
@Data
public class ScmApplyInboundVehicleVo implements Vo {
@ApiModelProperty("车辆信息sid")
private String sid;
@ApiModelProperty("车辆入库单sid")
private String applySid;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("车架号(VIN)")
private String vinNo;
}

41
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.java
View File

@ -0,0 +1,41 @@
package com.yxt.anrui.scm.biz.scmapplyinbound;
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.scm.api.scmapplyinbound.ScmApplyInboundListVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInbound;
import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo;
import java.util.List;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundMapper.java <br/>
* Class: com.yxt.anrui.scm.biz.scmapplyinbound.ScmApplyInboundMapper <br/>
* Description: 车辆入账单. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 11:54:35 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface ScmApplyInboundMapper extends BaseMapper<ScmApplyInbound> {
//@Update("update scm_apply_inbound set name=#{msg} where id=#{id}")
//IPage<ScmApplyInboundVo> voPage(IPage<ScmApplyInbound> page, @Param(Constants.WRAPPER) QueryWrapper<ScmApplyInbound> qw);
IPage<ScmApplyInboundListVo> selectPageVo(IPage<ScmApplyInbound> page, @Param(Constants.WRAPPER) Wrapper<ScmApplyInbound> qw);
List<ScmApplyInboundVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmApplyInbound> qw);
@Select("select * from scm_apply_inbound")
List<ScmApplyInboundVo> selectListVo();
}

17
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.xml
View File

@ -0,0 +1,17 @@
<?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.scmapplyinbound.ScmApplyInboundMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundListVo">
SELECT id, sid, applicationCode, applicationDate, purchaseOrderNo, modelName,
(select count(1) from scm_apply_inbound_vehicle where applySid=scm_apply_inbound.sid) vehicleNum
FROM scm_apply_inbound
<where> ${ew.sqlSegment} </where>
ORDER BY id DESC
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo">
SELECT * FROM scm_apply_inbound <where> ${ew.sqlSegment} </where>
</select>
</mapper>

58
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java
View File

@ -0,0 +1,58 @@
package com.yxt.anrui.scm.biz.scmapplyinbound;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.scm.api.scmapplyinbound.*;
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.*;
import java.util.List;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.biz.scmapplyinbound.ScmApplyInboundRest <br/>
* Description: 车辆入账单. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 11:54:35 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "车辆入账单")
@RestController
@RequestMapping("v1/scmapplyinbound")
public class ScmApplyInboundRest implements ScmApplyInboundFeign {
@Autowired
private ScmApplyInboundService scmApplyInboundService;
@Override
public ResultBean<PagerVo<ScmApplyInboundListVo>> listPage(@RequestBody PagerQuery<ScmApplyInboundQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmApplyInboundListVo> pv = scmApplyInboundService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean<List<ScmApplyInboundVo>> listAll(@RequestBody ScmApplyInboundQuery query){
ResultBean rb = ResultBean.fireFail();
List<ScmApplyInboundVo> list = scmApplyInboundService.listAllVo(query);
return rb.success().setData(list);
}
@Override
public ResultBean saveOrUpdateApplyInBound(ScmApplyInboundDto dto){
return scmApplyInboundService.saveOrUpdateApplyInBound(dto);
}
@Override
public ResultBean<ScmApplyInboundVo> fetchSid(String sid) {
return new ResultBean().setData(scmApplyInboundService.selectBySid(sid));
}
}

154
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
View File

@ -0,0 +1,154 @@
package com.yxt.anrui.scm.biz.scmapplyinbound;
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.scm.api.scmapplyinbound.*;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
import com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleService;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundService.java <br/>
* Class: com.yxt.anrui.scm.biz.scmapplyinbound.ScmApplyInboundService <br/>
* Description: 车辆入账单 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 11:54:35 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMapper, ScmApplyInbound> {
@Autowired
private ScmApplyInboundVehicleService scmApplyInboundVehicleService;
public PagerVo<ScmApplyInbound> listPage(PagerQuery<ScmApplyInboundQuery> pq) {
ScmApplyInboundQuery query = pq.getParams();
QueryWrapper<ScmApplyInbound> qw = createQueryWrapper(query);
IPage<ScmApplyInbound> page = PagerUtil.queryToPage(pq);
IPage<ScmApplyInbound> pagging = baseMapper.selectPage(page, qw);
PagerVo<ScmApplyInbound> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<ScmApplyInbound> listAll(ScmApplyInboundQuery query) {
QueryWrapper<ScmApplyInbound> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<ScmApplyInbound> createQueryWrapper(ScmApplyInboundQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmApplyInbound> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getPurchaseOrderNo())) {
qw.like("purchaseOrderNo", query.getPurchaseOrderNo());
}
if (StringUtils.isNotBlank(query.getModelName())) {
qw.like("modelName", query.getModelName());
}
return qw;
}
public PagerVo<ScmApplyInboundListVo> listPageVo(PagerQuery<ScmApplyInboundQuery> pq) {
ScmApplyInboundQuery query = pq.getParams();
QueryWrapper<ScmApplyInbound> qw = createQueryWrapper(query);
IPage<ScmApplyInbound> page = PagerUtil.queryToPage(pq);
IPage<ScmApplyInboundListVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmApplyInboundListVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<ScmApplyInboundVo> listAllVo(ScmApplyInboundQuery query) {
QueryWrapper<ScmApplyInbound> qw = createQueryWrapper(query);
return baseMapper.selectListAllVo(qw);
}
public List<ScmApplyInboundVo> listVo() {
return baseMapper.selectListVo();
}
/**
* 新增和修改车辆入账单
* @param dto
*/
@Transactional(rollbackFor = Exception.class)
public ResultBean saveOrUpdateApplyInBound(ScmApplyInboundDto dto){
// 验证车架号：不能为空、不能重复
List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
List<String> vinNoList = vehicleList.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList());
if (vehicleList.size() != vinNoList.size()) {
return new ResultBean().fail().setMsg("车架号不能为空");
}
// 去重
long disCount = vinNoList.stream().distinct().count();
if (vinNoList.size() != disCount) {
return new ResultBean().fail().setMsg("车架号不能重复");
}
if (StringUtils.isBlank(dto.getSid())) { // 新增
// 验证数据库是否重复
for (int i = 0; i < vinNoList.size(); i++) {
int count = scmApplyInboundVehicleService.checkVinNo(vinNoList.get(i), "");
if (count != 0) {
return new ResultBean().setMsg("车架号已经存在");
}
}
ScmApplyInbound inboundVehicle = new ScmApplyInbound();
BeanUtil.copyProperties(dto, inboundVehicle);
inboundVehicle.setSid(UUID.randomUUID().toString());
save(inboundVehicle);
// 保存车辆列表
scmApplyInboundVehicleService.saveApplyInboundVehicleList(vehicleList, inboundVehicle.getSid(), inboundVehicle.getModelSid());
return new ResultBean().success().setMsg("保存成功");
} else { // 修改
// 采购订单下线日期一旦维护，二次确认，则不能修改 TODO
// 验证数据库是否重复
for (int i = 0; i < vinNoList.size(); i++) {
int count = scmApplyInboundVehicleService.checkVinNo(vinNoList.get(i), dto.getSid());
if (count != 0) {
return new ResultBean().setMsg("车架号已经存在");
}
}
ScmApplyInbound scmApplyInbound = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, scmApplyInbound);
updateById(scmApplyInbound);
// 更新车辆列表信息
scmApplyInboundVehicleService.updateApplyInboundVehicleList(vehicleList);
return new ResultBean().success().setMsg("修改成功");
}
}
/**
* 根据sid查询车辆入账单详情
* @param sid
* @return
*/
public ScmApplyInboundVo selectBySid(String sid) {
ScmApplyInboundVo vo = new ScmApplyInboundVo();
ScmApplyInbound scmApplyInbound = fetchBySid(sid);
BeanUtil.copyProperties(scmApplyInbound, vo);
List<ScmApplyInboundVehicleVo> list = scmApplyInboundVehicleService.selectListByAppSid(sid);
vo.setInboundVehicleList(list);
return vo;
}
}

39
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.java
View File

@ -0,0 +1,39 @@
package com.yxt.anrui.scm.biz.scmapplyinboundvehicle;
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 org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
import java.util.List;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundVehicleMapper.java <br/>
* Class: com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleMapper <br/>
* Description: 入库车辆信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 12:00:53 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface ScmApplyInboundVehicleMapper extends BaseMapper<ScmApplyInboundVehicle> {
//@Update("update scm_apply_inbound_vehicle set name=#{msg} where id=#{id}")
//IPage<ScmApplyInboundVehicleVo> voPage(IPage<ScmApplyInboundVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<ScmApplyInboundVehicle> qw);
IPage<ScmApplyInboundVehicleVo> selectPageVo(IPage<ScmApplyInboundVehicle> page, @Param(Constants.WRAPPER) Wrapper<ScmApplyInboundVehicle> qw);
int checkVinNo(@Param("vinNo") String vinNo, @Param("applySid") String applySid);
List<ScmApplyInboundVehicleVo> selectListByAppSid(@Param("applySid") String applySid);
}

20
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.xml
View File

@ -0,0 +1,20 @@
<?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.scmapplyinboundvehicle.ScmApplyInboundVehicleMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo">
SELECT * FROM scm_apply_inbound_vehicle <where> ${ew.sqlSegment} </where>
</select>
<select id="checkVinNo" resultType="int">
SELECT count(1) FROM scm_apply_inbound_vehicle WHERE vinNo=#{vinNo}
<if test="applySid != null and applySid !='' ">
AND applySid != #{applySid}
</if>
</select>
<select id="selectListByAppSid" resultType="com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo">
SELECT * FROM scm_apply_inbound_vehicle WHERE applySid=#{applySid}
</select>
</mapper>

46
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleRest.java
View File

@ -0,0 +1,46 @@
package com.yxt.anrui.scm.biz.scmapplyinboundvehicle;
import cn.hutool.core.bean.BeanUtil;
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 io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleQuery;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleFeign;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundVehicleFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleRest <br/>
* Description: 入库车辆信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 12:00:53 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "入库车辆信息")
@RestController
@RequestMapping("v1/scmapplyinboundvehicle")
public class ScmApplyInboundVehicleRest implements ScmApplyInboundVehicleFeign {
@Autowired
private ScmApplyInboundVehicleService scmApplyInboundVehicleService;
@Override
public ResultBean<PagerVo<ScmApplyInboundVehicleVo>> listPage(@RequestBody PagerQuery<ScmApplyInboundVehicleQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmApplyInboundVehicleVo> pv = scmApplyInboundVehicleService.listPageVo(pq);
return rb.success().setData(pv);
}
}

118
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleService.java
View File

@ -0,0 +1,118 @@
package com.yxt.anrui.scm.biz.scmapplyinboundvehicle;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleQuery;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleFeign;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-scm(进销存) <br/>
* File: ScmApplyInboundVehicleService.java <br/>
* Class: com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleService <br/>
* Description: 入库车辆信息 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-02 12:00:53 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class ScmApplyInboundVehicleService extends MybatisBaseService<ScmApplyInboundVehicleMapper, ScmApplyInboundVehicle> {
public PagerVo<ScmApplyInboundVehicle> listPage(PagerQuery<ScmApplyInboundVehicleQuery> pq) {
ScmApplyInboundVehicleQuery query = pq.getParams();
QueryWrapper<ScmApplyInboundVehicle> qw = createQueryWrapper(query);
IPage<ScmApplyInboundVehicle> page = PagerUtil.queryToPage(pq);
IPage<ScmApplyInboundVehicle> pagging = baseMapper.selectPage(page, qw);
PagerVo<ScmApplyInboundVehicle> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<ScmApplyInboundVehicle> listAll(ScmApplyInboundVehicleQuery query) {
QueryWrapper<ScmApplyInboundVehicle> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<ScmApplyInboundVehicle> createQueryWrapper(ScmApplyInboundVehicleQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmApplyInboundVehicle> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getModelSid())) {
qw.eq("modelSid", query.getModelSid());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.eq("vinNo", query.getVinNo());
}
return qw;
}
public PagerVo<ScmApplyInboundVehicleVo> listPageVo(PagerQuery<ScmApplyInboundVehicleQuery> pq) {
ScmApplyInboundVehicleQuery query = pq.getParams();
QueryWrapper<ScmApplyInboundVehicle> qw = createQueryWrapper(query);
IPage<ScmApplyInboundVehicle> page = PagerUtil.queryToPage(pq);
IPage<ScmApplyInboundVehicleVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmApplyInboundVehicleVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
/**
* 验证车架号是否重复
* @return
*/
public int checkVinNo(String vinNo, String applySid) {
return baseMapper.checkVinNo(vinNo, applySid);
}
/**
* 保存车辆列表
* @param list
* @param applySid
* @param modelSid
*/
public void saveApplyInboundVehicleList(List<ScmApplyInboundVehicleDto> list, String applySid, String modelSid) {
for (ScmApplyInboundVehicleDto dto : list) {
ScmApplyInboundVehicle inboundVehicle = new ScmApplyInboundVehicle();
BeanUtil.copyProperties(dto, inboundVehicle);
inboundVehicle.setApplySid(applySid);
inboundVehicle.setModelSid(modelSid);
save(inboundVehicle);
}
}
/**
* 修改车辆列表
* @param list
*/
public void updateApplyInboundVehicleList(List<ScmApplyInboundVehicleDto> list) {
for (ScmApplyInboundVehicleDto dto : list) {
ScmApplyInboundVehicle inboundVehicle = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, inboundVehicle);
updateById(inboundVehicle);
}
}
/**
* 根据车辆入账单查询车辆信息
* @param applySid
* @return
*/
public List<ScmApplyInboundVehicleVo> selectListByAppSid(String applySid) {
return baseMapper.selectListByAppSid(applySid);
}
}

BIN
工作计划/安瑞信息化平台工作内容.xlsx
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save