Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
commit
0fd028f3ca
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java
  2. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java
  3. 11
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java
  4. 16
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java
  5. 13
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java
  6. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java
  7. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java
  8. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java
  9. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
  10. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
  11. 40
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java
  12. 16
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
  13. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java
  14. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
  15. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java
  16. 65
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
  17. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
  18. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
  19. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
  20. 26
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
  21. 47
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
  22. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java
  23. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
  24. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
  25. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSaleOrderInitModelInfoVo.java
  26. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSaleOrderStateVo.java
  27. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderAllDto.java
  28. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderBillInfoVo.java
  29. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderQuery.java
  30. 51
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderVo.java
  31. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppCarInfo.java
  32. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppModelInfo.java
  33. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCar.java
  34. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCarList.java
  35. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderInfo.java
  36. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppReadyCar.java
  37. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppReadyCarList.java
  38. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrderDto.java
  39. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  40. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  41. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
  42. 54
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  43. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  44. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  45. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java
  46. 14
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue
  47. 125
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanAdd.vue
  48. 45
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue
  49. 1
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanSubmit.vue
  50. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  51. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmmaterial/ScmMaterialDetailsVo.java
  52. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmrealtimeinventory/ScmRealTimeInventoryVo.java
  53. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmreturn/ScmReturnVo.java
  54. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialMapper.xml
  55. 16
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialService.java
  56. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmrealtimeinventory/ScmRealTimeInventoryService.java
  57. 30
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmreturn/ScmReturnService.java
  58. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
  59. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java
  60. 46
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractRest.java
  61. 48
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractService.java
  62. 104
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java
  63. 144
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java
  64. 1
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java

@ -131,6 +131,9 @@ public class BaseModelConfig extends BaseEntity {
@ApiModelProperty("货箱(重汽、欧曼)")
private String packingCase;
@ApiModelProperty("货箱key(重汽、欧曼)")
private String packingCaseKey;
/* @ApiModelProperty("上装装置(欧曼)")
private String installingDevice;*/

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java

@ -130,6 +130,9 @@ public class BaseModelConfigDto implements Dto {
@ApiModelProperty("货箱(重汽、欧曼)")
private String packingCase;
@ApiModelProperty("货箱key(重汽、欧曼)")
private String packingCaseKey;
/* @ApiModelProperty("上装装置(欧曼)")
private String installingDevice;*/

11
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java

@ -95,7 +95,10 @@ public class BaseModelConfigVo implements Vo {
private String suspension;
@ApiModelProperty("货箱(重汽、欧曼)")
private String packingCase;
/* @ApiModelProperty("上装装置(欧曼)")
@ApiModelProperty("货箱key(重汽、欧曼)")
private String packingCaseKey;
/* @ApiModelProperty("上装装置(欧曼)")
private String installingDevice;*/
@ApiModelProperty("座椅key")
private String seatKey;
@ -125,6 +128,12 @@ public class BaseModelConfigVo implements Vo {
private String configName;
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty(value = "关联状态(1已关联,0未关联)")
private Integer isRelationState;
@ApiModelProperty(value = "使用状态(1已使用,0未使用)")
private Integer isUseState;
@ApiModelProperty(value = "销售指导价")
private String guidedPrice;
/* @ApiModelProperty(value = "车型名称")
private String modelName;
@ApiModelProperty(value = "发动机型号")

16
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java

@ -7,6 +7,8 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author dimengzhe
* @date 2021/9/29 8:53
@ -63,10 +65,6 @@ public class BaseVehicleModelDetailsVo implements Vo {
private String engineType;
@ApiModelProperty(value = "发动机型号value")
private String engineTypeValue;
@ApiModelProperty("系列key")
private String series;
@ApiModelProperty("系列value")
private String seriesValue;
/* @ApiModelProperty(value = "悬架key")
private String suspension;
@ApiModelProperty(value = "悬架value值")
@ -109,9 +107,15 @@ public class BaseVehicleModelDetailsVo implements Vo {
@ApiModelProperty(value = "内部编码(欧曼特有)")
private String insideCode;
@ApiModelProperty(value = "系别(欧曼特有)")
@ApiModelProperty(value = "车型编码")
private String vehicleTypeCode;
@ApiModelProperty(value = "系别key(欧曼特有)")
private String department;
@ApiModelProperty(value = "系别value(欧曼特有)")
private String departmentValue;
/*@ApiModelProperty(value = "是否常用车型")
private Integer isCommonModel;*/
@ -119,5 +123,5 @@ public class BaseVehicleModelDetailsVo implements Vo {
private Integer isDel;
@ApiModelProperty("简述配置信息")
private BaseModelConfigVo baseModelConfigVo;
private List<BaseModelConfigVo> baseModelConfigVo;
}

13
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java

@ -74,7 +74,7 @@ public interface BaseVehicleModelFeign {
@ApiOperation("车型图片上传")
@ApiImplicitParam(name = "file", value = "文件", required = true, dataType = "MultipartFile", dataTypeClass = MultipartFile.class)
@PostMapping("/pictureUpload")
public ResultBean pictureUpload (@RequestParam("modelSid") String modelSid, @RequestParam(value = "file") MultipartFile file);
public ResultBean pictureUpload(@RequestParam("modelSid") String modelSid, @RequestParam(value = "file") MultipartFile file);
/**
* 删除批量删除
@ -108,7 +108,6 @@ public interface BaseVehicleModelFeign {
public ResultBean<BaseVehicleModelSelectVo> getAll(@PathVariable("sid") String sid);
/**
* 车型列表导出
*
@ -194,4 +193,14 @@ public interface BaseVehicleModelFeign {
@ApiOperation("新增意向车型选择车型查询车型列表")
@PostMapping("/listPageByVehmodel")
public ResultBean<PagerVo<VehModelVo>> listPageByVehmodel(@RequestBody PagerQuery<VehModelQuery> pq);
/**
* 根据常用配置sid查询关联车型
*
* @return
*/
@ApiOperation("根据常用配置sid查询关联车型")
@PostMapping("/selectVehModelByConfigSid")
public ResultBean<PagerVo<BaseVehicleModelVo>> selectVehModelByConfigSid(@RequestBody PagerQuery<BaseVehicleModelQuery> pagerQuery);
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java

@ -108,6 +108,12 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
return null;
}
@Override
public ResultBean<PagerVo<BaseVehicleModelVo>> selectVehModelByConfigSid(PagerQuery<BaseVehicleModelQuery> pagerQuery) {
return null;
}
/*@Override
public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {
return null;

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java

@ -23,6 +23,10 @@ import lombok.Data;
@Data
public class BaseVehicleModelQuery implements Query {
@ApiModelProperty(value = "常用配置sid")
private String configSid;
@ApiModelProperty(value = "车型sid")
private String modelSid;
@ApiModelProperty(value = "品牌sid")
private String carBrand;
@ApiModelProperty(value = "功能key")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java

@ -28,6 +28,8 @@ public class BaseVehicleModelVo implements Vo {
@ApiModelProperty(value = "车型sid")
private String sid;
@ApiModelProperty(value = "配置sid")
private String configSid;
@ApiModelProperty(value = "品牌名称")
private String brandName;
@ApiModelProperty(value = "车辆类型(牵引车、挂车等)")

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java

@ -34,6 +34,10 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-base(车型信息) <br/>
* File: BaseVehmodelConfigFeign.java <br/>
@ -69,7 +73,7 @@ public interface BaseVehmodelConfigFeign {
@ApiOperation("车型与常用配置解除关联关系")
@DeleteMapping("/checkRelieve")
public ResultBean checkRelieve(@RequestParam("modelSid") String modelSid, @RequestParam("configurationItemsSid") String configurationItemsSid);
public ResultBean checkRelieve(@RequestBody List<Map<String, String>> maps);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchBySid/{sid}")

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java

@ -31,6 +31,9 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-base(车型信息) <br/>
* File: BaseVehmodelConfigFeignFallback.java <br/>
@ -64,7 +67,7 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
}
@Override
public ResultBean checkRelieve(String modelSid, String configurationItemsSid) {
public ResultBean checkRelieve(List<Map<String, String>> maps) {
return null;
}

40
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java

@ -48,63 +48,67 @@ import lombok.Data;
@Data
public class BusVehicleOrderVo implements Vo {
private static final long serialVersionUID = 5581370535272361633L;
@ApiModelProperty("采购订单sid")
private String sid; // 采购订单sid
private String sid;
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
private String createOrgSid;
@ApiModelProperty("车型")
private String modelName;
@ApiModelProperty("订单编号")
private String orderNo; // 订单编号
private String orderNo;
@ApiModelProperty("订单类型key")
private String orderTypeKey; // 订单类型key
private String orderTypeKey;
@ApiModelProperty("订单类型")
private String orderType; // 订单类型
private String orderType;
@ApiModelProperty("订单日期")
private String orderDate; // 订单日期
private String orderDate;
@ApiModelProperty("排产/采购申请sid")
private String purchaseRequisitionSid; // 排产/采购申请sid
private String purchaseRequisitionSid;
@ApiModelProperty("排产/采购申请中车型表sid")
private String purchaseApplyMediumModelSid; // 排产/采购申请中车型表sid
private String purchaseApplyMediumModelSid;
@ApiModelProperty("台数")
private String platformNo; // 台数
private String platformNo;
@ApiModelProperty("上装价格")
private String coatPrice; // 上装价格
private String coatPrice;
@ApiModelProperty("入库价格")
private String treasuryPrice; // 入库价格
private String treasuryPrice;
@ApiModelProperty("运费")
private String freight; // 运费
private String freight;
@ApiModelProperty("销售指导价")
private String salesGuidePrice; // 销售指导价
private String salesGuidePrice;
@ApiModelProperty("预计上线日期")
private String expectLaunchDate; // 预计上线日期
private String expectLaunchDate;
@ApiModelProperty("上线日期")
private String launchDate; // 上线日期
private String launchDate;
@ApiModelProperty("下线日期")
private String offlineDate; // 下线日期
private String offlineDate;
@ApiModelProperty("排产申请编号")
private String applicationCode;
@ApiModelProperty("订单状态")
private String orderStatus; // 订单状态
private String orderStatus;
@ApiModelProperty("备注")
private String remarks; // 备注
private String remarks;
@ApiModelProperty(value = "锁定台数")
private String lockingNum;
}

16
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemodelconfig.*;
import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderDetailsVo;
import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
@ -44,12 +46,26 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
private BaseModelConfigService baseModelConfigService;
@Autowired
private BaseVehicleModelService baseVehicleModelService;
@Autowired
private BaseVehmodelConfigService baseVehmodelConfigService;
@Override
public ResultBean<PagerVo<BaseModelConfigVo>> pagerList(PagerQuery<BaseModelConfigQuery> pagerQuery) {
ResultBean<PagerVo<BaseModelConfigVo>> rb = ResultBean.fireFail();
IPage<BaseModelConfigVo> page = baseModelConfigService.pagerList(pagerQuery);
List<BaseModelConfigVo> records = page.getRecords();
for (BaseModelConfigVo record : records) {
String sid = record.getSid();
List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSid(sid);
if (baseVehmodelConfigVos.size() > 0){
record.setIsRelationState(1);
record.setIsUseState(1);
}else {
record.setIsRelationState(0);
record.setIsUseState(0);
}
}
PagerVo<BaseModelConfigVo> pv = new PagerVo<>();
PagerVo<BaseModelConfigVo> pv1 = PagerUtil.pageToVo(page, pv);
return rb.success().setData(pv1);

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java

@ -147,4 +147,5 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
IPage<VehModelVo> listPageByVehmodel(IPage<VehModelVo> page,@Param(Constants.WRAPPER) QueryWrapper<VehModelVo> qw);
}

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@ -159,17 +159,13 @@
<select id="getPcChooseListByModelSid"
resultType="com.yxt.anrui.base.api.basemodelconfig.PcChooseBaseModelConfigVo">
SELECT bvm.sid,
bov.`VINNo`,
bov.`vehicleCode`,
bvm.`gearboxTypeValue`,
bvm.`emissionStandardValue`,
bvm.`driveFormValue`,
bvm.`powerValue`,
bov.`vehicleColor`,
bmc.`specification`,
bmc.`fuelTank`
FROM anrui_base.base_vehicle_model bvm
LEFT JOIN anrui_buscenter.`bus_order_vehicle` bov ON bvm.sid = bov.`vehicleSid`
LEFT JOIN anrui_base.base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
LEFT JOIN anrui_base.base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
WHERE bvm.sid = #{vehicleSid} LIMIT 1
@ -283,6 +279,9 @@
bvm.specifications,
<!--内部编码(欧曼特有)-->
bvm.insideCode,
<!--系列-->
bvm.productLine,
bvm.productLineValue,
<!--系别(欧曼特有)-->
bvm.department,
bvm.departmentValue,

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@ -250,6 +250,15 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
return rb.success().setData(pv);
}
@Override
public ResultBean<PagerVo<BaseVehicleModelVo>> selectVehModelByConfigSid(@RequestBody PagerQuery<BaseVehicleModelQuery> pagerQuery) {
ResultBean<PagerVo<BaseVehicleModelVo>> rb = ResultBean.fireFail();
IPage<BaseVehicleModelVo> page = baseVehicleModelService.selectVehModelByConfigSid(pagerQuery);
PagerVo<BaseVehicleModelVo> pv = new PagerVo<>();
PagerVo<BaseVehicleModelVo> pv1 = PagerUtil.pageToVo(page, pv);
return rb.success().setData(pv1);
}
// @Override
// public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {

65
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@ -3,6 +3,9 @@ package com.yxt.anrui.base.biz.basevehiclemodel;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo;
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigVo;
import com.yxt.anrui.base.api.basemodelconfig.PcChooseBaseModelConfigVo;
import com.yxt.anrui.base.api.basemodelszconfig.BaseModelSzconfigVo;
@ -12,9 +15,12 @@ import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix;
import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixDto;
import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixQuery;
import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo;
import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemand;
import com.yxt.anrui.portal.api.sysorganization.SysOrgVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
@ -34,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.validation.constraints.NotBlank;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -57,13 +64,13 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private BaseModelSzconfigService baseModelSzconfigService;
@Autowired
private BaseTrailerService baseTrailerService;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private BaseVehicleModelAppendixService baseVehicleModelAppendixService;
@Autowired
private BaseVehmodelConfigService baseVehmodelConfigService;
@Autowired
private BaseModelConfigService baseModelConfigService;
/**
* 车型信息分页列表
@ -87,6 +94,12 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
QueryWrapper<BaseVehicleModelVo> qw = new QueryWrapper<>();
if (pagerQuery != null) {
qw.eq("bvm.isDelete", "0");
if (StringUtils.isNotBlank(pagerQuery.getModelSid())) {//车型sid
qw.eq("bvm.sid", pagerQuery.getModelSid());
}
if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌sid
qw.eq("bvm.carBrand", pagerQuery.getCarBrand());
}
if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌sid
qw.eq("bvm.carBrand", pagerQuery.getCarBrand());
}
@ -154,10 +167,20 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
}
baseVehicleModelDetailsVo.setUseOrg(s);
}
PcChooseBaseModelConfigVo pcChooseBaseModelConfigVo = this.getPcChooseListByModelSid(sid);
BaseModelConfigVo baseModelConfigVo = new BaseModelConfigVo();
BeanUtil.copyProperties(pcChooseBaseModelConfigVo, baseModelConfigVo);
baseVehicleModelDetailsVo.setBaseModelConfigVo(baseModelConfigVo != null ? baseModelConfigVo : new BaseModelConfigVo());
List<BaseModelConfigVo> baseModelConfigVos = new ArrayList<>();
List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getVehModByModelSid(sid);
if (baseVehmodelConfigVos.size() > 0){
for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) {
BaseModelConfigVo baseModelConfigVo = new BaseModelConfigVo();
String configurationItemsSid = baseVehmodelConfigVo.getConfigurationItemsSid();
BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(configurationItemsSid);
BeanUtil.copyProperties(baseModelConfig, baseModelConfigVo);
baseModelConfigVo.setGuidedPrice(baseVehmodelConfigVo.getGuidedPrice());
baseModelConfigVos.add(baseModelConfigVo);
}
baseVehicleModelDetailsVo.setBaseModelConfigVo(baseModelConfigVos);
}
return baseVehicleModelDetailsVo;
}
@ -549,4 +572,30 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
}
return qw;
}
public IPage<BaseVehicleModelVo> selectVehModelByConfigSid(PagerQuery<BaseVehicleModelQuery> pagerQuery) {
List<BaseVehicleModelVo> baseVehicleModelVos = new ArrayList<>();
IPage<BaseVehicleModelVo> baseVehicleModelVo = new Page<>();
BaseVehicleModelQuery params = pagerQuery.getParams();
IPage<BaseVehicleModelQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<BaseVehicleModelVo> qw = buildQueryWrapper(params);
List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSid(params.getConfigSid());
for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) {
String modelSid = baseVehmodelConfigVo.getModelSid();
params.setModelSid(modelSid);
IPage<BaseVehicleModelVo> baseVehicleModelVoIPage = baseMapper.pagerList(page, qw);
List<BaseVehicleModelVo> records = baseVehicleModelVoIPage.getRecords();
for (BaseVehicleModelVo record : records) {
record.setConfigSid(params.getConfigSid());
baseVehicleModelVos.add(record);
}
baseVehicleModelVo.setPages(baseVehicleModelVoIPage.getPages());
baseVehicleModelVo.setCurrent(baseVehicleModelVoIPage.getCurrent());
baseVehicleModelVo.setSize(baseVehicleModelVoIPage.getSize());
baseVehicleModelVo.setTotal(baseVehicleModelVoIPage.getTotal());
baseVehicleModelVo.setRecords(baseVehicleModelVos);
}
return baseVehicleModelVo;
}
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java

@ -120,4 +120,8 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
BaseVehmodelVo selectO(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
AppModelConfigListVo selectCarConfigSummary(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("orgSid") String orgSid);
List<BaseVehmodelConfigVo> getListByConfigSid(String sid);
List<BaseVehmodelConfigVo> getVehModByModelSid(String sid);
}

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@ -251,4 +251,12 @@
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid LIKE concat('%', #{orgSid}, '%')
</select>
<select id="getListByConfigSid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
SELECT * FROM base_vehmodel_config WHERE configurationItemsSid = #{sid}
</select>
<select id="getVehModByModelSid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
SELECT * FROM base_vehmodel_config WHERE modelSid = #{sid}
</select>
</mapper>

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java

@ -37,6 +37,10 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-base(车型信息) <br/>
* File: BaseVehmodelConfigFeignFallback.java <br/>
@ -84,8 +88,8 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
}
@Override
public ResultBean checkRelieve(String modelSid, String configurationItemsSid) {
return baseVehmodelConfigService.checkRelieve(modelSid, configurationItemsSid);
public ResultBean checkRelieve(List<Map<String, String>> maps) {
return baseVehmodelConfigService.checkRelieve(maps);
}
@Override

26
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@ -46,7 +46,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-base(车型信息) <br/>
@ -415,14 +417,18 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
return rb.success().setMsg("关联成功");
}
public ResultBean checkRelieve(String modelSid, String configurationItemsSid) {
public ResultBean checkRelieve(List<Map<String, String>> maps) {
ResultBean rb = ResultBean.fireFail();
BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid);
if (vo == null) {
return rb.setMsg("当前常用配置信息未关联当前车型,请重新选择");
for (Map<String, String> map : maps) {
String modelSid = map.get("modelSid");
String configurationItemsSid = map.get("configurationItemsSid");
BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid);
if (vo == null) {
return rb.setMsg("当前常用配置信息未关联当前车型,请重新选择");
}
String sid = vo.getSid();
deleteBySid(sid);
}
String sid = vo.getSid();
deleteBySid(sid);
return rb.success().setMsg("解除成功");
}
@ -510,4 +516,12 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
vo.setMoreConfig(appModelConfigListVo.getOtherConfig());
return vo;
}
public List<BaseVehmodelConfigVo> getListByConfigSid(String sid) {
return baseMapper.getListByConfigSid(sid);
}
public List<BaseVehmodelConfigVo> getVehModByModelSid(String sid) {
return baseMapper.getVehModByModelSid(sid);
}
}

47
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml

@ -4,11 +4,11 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.busvehicleorder.VehicleOrderListVo">
SELECT bvo.*,bvm.modelName
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
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>
@ -24,20 +24,20 @@
<select id="getAppProductionSchedulingByPageList"
resultType="com.yxt.anrui.base.api.busvehicleorder.AppProductionSchedulingByPageVo">
SELECT bvad.vehicleSid AS modelSid,
bvad.configSid AS configSid,
bvm.vehicleAlias,
bvm.brandName,
bvm.carBrand AS brandSid,
bvm.vehicleVersionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue,
bvo.orderStatus,
bvad.actualQuantity,
bvo.salesGuidePrice AS guidedPrice
SELECT bvad.vehicleSid AS modelSid,
bvad.configSid AS configSid,
bvm.vehicleAlias,
bvm.brandName,
bvm.carBrand AS brandSid,
bvm.vehicleVersionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue,
bvo.orderStatus,
bvad.actualQuantity,
bvo.salesGuidePrice AS guidedPrice
FROM bus_vehicle_order bvo
LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid
LEFT JOIN base_vehicle_model bvm ON bvad.vehicleSid = bvm.sid
LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid
LEFT JOIN base_vehicle_model bvm ON bvad.vehicleSid = bvm.sid
<where>
${ew.sqlSegment}
</where>
@ -130,9 +130,9 @@
<!-- 更多配置-->
bc.otherConfig
from bus_vehicle_order bo
left join bus_vehicle_apply_detail bv on bv.sid = bo.purchaseApplyMediumModelSid
left join base_vehicle_model bm on bm.sid = bv.vehicleSid
left join base_model_config bc on bc.sid = bv.configSid
left join bus_vehicle_apply_detail bv on bv.sid = bo.purchaseApplyMediumModelSid
left join base_vehicle_model bm on bm.sid = bv.vehicleSid
left join base_model_config bc on bc.sid = bv.configSid
where bo.sid = #{sid}
</select>
@ -180,10 +180,11 @@
bvo.orderStatus,
bvm.modelName,
bva.applicationCode,
bvo.remarks
bvo.remarks,
bvo.lockingNum
FROM bus_vehicle_order bvo
LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid = bvm.sid
LEFT JOIN bus_vehicle_apply bva ON bvo.purchaseRequisitionSid = bva.sid
LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid = bvm.sid
LEFT JOIN bus_vehicle_apply bva ON bvo.purchaseRequisitionSid = bva.sid
WHERE bvo.sid = #{sid}
</select>

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java

@ -92,6 +92,9 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
public ResultBean<BusVehicleOrderVo> fetchBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
BusVehicleOrderVo vo = busVehicleOrderService.selectBySid(sid);
if(vo == null){
return rb.setData(new BusVehicleOrderVo());
}
return rb.success().setData(vo);
}

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSaleOrderInitModelInfoVo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSaleOrderInitModelInfoVo.java

@ -1,4 +1,4 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
package com.yxt.anrui.buscenter.api.bussalesorder.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
@ -7,6 +7,7 @@ import lombok.Data;
@Data
public class AppBusSaleOrderInitModelInfoVo implements Vo {
private static final long serialVersionUID = 342793087650993718L;
@ApiModelProperty("")
private AppOrderInfo orderInfo;

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSaleOrderStateVo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSaleOrderStateVo.java

@ -1,4 +1,4 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
package com.yxt.anrui.buscenter.api.bussalesorder.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
@ -6,6 +6,7 @@ import lombok.Data;
@Data
public class AppBusSaleOrderStateVo implements Vo {
private static final long serialVersionUID = -7047192316492033608L;
//0 未完善 1 已完善

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderAllDto.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderAllDto.java

@ -1,4 +1,4 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
package com.yxt.anrui.buscenter.api.bussalesorder.app;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
@ -7,6 +7,7 @@ import lombok.Data;
@Data
public class AppBusSalesOrderAllDto implements Dto {
private static final long serialVersionUID = -1063289603093410032L;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("手机号")

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderBillInfoVo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderBillInfoVo.java

@ -1,4 +1,4 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
package com.yxt.anrui.buscenter.api.bussalesorder.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
@ -7,6 +7,7 @@ import lombok.Data;
@Data
public class AppBusSalesOrderBillInfoVo implements Vo {
private static final long serialVersionUID = 4786720071719311565L;
@ApiModelProperty("客户名称")
private String customerName;

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderQuery.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderQuery.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.bussalesorder;
package com.yxt.anrui.buscenter.api.bussalesorder.app;
import com.yxt.common.core.query.Query;
@ -49,6 +49,7 @@ import lombok.Data;
public class AppBusSalesOrderQuery implements Query {
private static final long serialVersionUID = -3569921757656322272L;
@ApiModelProperty("用户sid")
private String userSid;

51
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderVo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderVo.java

@ -23,19 +23,15 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.bussalesorder;
package com.yxt.anrui.buscenter.api.bussalesorder.app;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* Project: anrui-buscenter(业务管理) <br/>
* File: BusSalesOrderVo.java <br/>
@ -54,31 +50,72 @@ import java.util.List;
public class AppBusSalesOrderVo implements Vo {
private static final long serialVersionUID = -5570433499942792774L;
/**
* 销售订单sid
*/
@ApiModelProperty("销售订单sid")
@JsonProperty("customerImage")
private String saleOrderSid;
/**
* 销售订单编号
*/
@ApiModelProperty("销售订单编号")
@JsonProperty("saleOrderId")
private String saleOrderId;
/**
* 客户类型
*/
@ApiModelProperty("客户类型")
private String customerType;
/**
* 客户sid
*/
@ApiModelProperty("客户sid")
private String customerSid;
/**
* 客户名称
*/
@ApiModelProperty("客户名称")
private String customerName;
/**
* 客户头像
*/
@ApiModelProperty("客户头像")
@JsonProperty("customerImage")
private String customerImage;
/**
* 手机号
*/
@ApiModelProperty("手机号")
private String mobile;
/**
* 购车方式
*/
@ApiModelProperty("购车方式")
private String carPurchaseType;
/**
* 购车方式key
*/
@ApiModelProperty("购车方式key")
private String carPurchaseKey;
/**
* 销售订单状态
*/
@ApiModelProperty("销售订单状态")
private String saleOrderState;
/**
* 创建日期
*/
@ApiModelProperty("创建日期")
private String createdDate;
/**
* 是否保险
*/
@ApiModelProperty("是否保险")
private String insuranceInfo;
/**
* 订金
*/
@ApiModelProperty("订金")
private String deposit;
@ApiModelProperty("是否显示修改订单按钮")

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppCarInfo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppCarInfo.java

@ -1,4 +1,4 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
package com.yxt.anrui.buscenter.api.bussalesorder.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
@ -9,6 +9,7 @@ import java.util.List;
@Data
public class AppCarInfo implements Vo {
private static final long serialVersionUID = 4029925477789404414L;
@ApiModelProperty("销售订单-车型确认-现车")
private List<AppNowCar> nowCar;

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppModelInfo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppModelInfo.java

@ -1,4 +1,4 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
package com.yxt.anrui.buscenter.api.bussalesorder.app;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppNowCar.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCar.java

@ -1,4 +1,4 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
package com.yxt.anrui.buscenter.api.bussalesorder.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
@ -7,6 +7,7 @@ import lombok.Data;
@Data
public class AppNowCar implements Vo {
private static final long serialVersionUID = -6377764723851635242L;
@ApiModelProperty("车架号")
private String vin;

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppNowCarList.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCarList.java

@ -1,4 +1,4 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
package com.yxt.anrui.buscenter.api.bussalesorder.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
@ -7,6 +7,7 @@ import lombok.Data;
@Data
public class AppNowCarList implements Vo {
private static final long serialVersionUID = 2686499164252521275L;
@ApiModelProperty("车架号")
private String vin;

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppOrderInfo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderInfo.java

@ -1,4 +1,4 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
package com.yxt.anrui.buscenter.api.bussalesorder.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
@ -9,6 +9,7 @@ import java.util.List;
@Data
public class AppOrderInfo implements Vo {
private static final long serialVersionUID = 360634636966708686L;
@ApiModelProperty("提示")
private String notice;

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppReadyCar.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppReadyCar.java

@ -1,4 +1,4 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
package com.yxt.anrui.buscenter.api.bussalesorder.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
@ -7,6 +7,7 @@ import lombok.Data;
@Data
public class AppReadyCar implements Vo {
private static final long serialVersionUID = -6797740135964430331L;
@ApiModelProperty("排产订单编号")
private String orderId;

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppReadyCarList.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppReadyCarList.java

@ -1,4 +1,4 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
package com.yxt.anrui.buscenter.api.bussalesorder.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
@ -7,6 +7,7 @@ import lombok.Data;
@Data
public class AppReadyCarList implements Vo {
private static final long serialVersionUID = 5257855685147744221L;
@ApiModelProperty("排产订单编号")
private String orderId;

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrderDto.java

@ -56,8 +56,6 @@ public class BusSalesVehicleOrderDto implements Dto {
private String linkNo;
@ApiModelProperty("采购订单日期")
private String linkText;
@ApiModelProperty("可使用台数")
private Integer useNum;
@ApiModelProperty("本次使用台数")
private Integer usingNum;

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@ -31,6 +31,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderBillInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.AppModelInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@ -36,7 +36,7 @@
where sid = #{businessSid}
</update>
<!--app查询销售订单列表-->
<select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.AppBusSalesOrderVo">
<select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderVo">
SELECT bo.sid AS saleOrderSid,
bo.billNo AS saleOrderId,
bo.customerClass AS customerType,
@ -60,7 +60,7 @@
</where>
</select>
<!--根据销售订单sid查询车型信息-->
<select id="selectModelInfoByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.AppModelInfo">
<select id="selectModelInfoByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.AppModelInfo">
SELECT modelName AS model,
brandName AS brand,
guildPrice AS price
@ -68,7 +68,7 @@
where bm.salesOrderSid = #{saleOrderSid}
</select>
<!--App初始化销售订单单据信息-->
<select id="getBillInfo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.AppBusSalesOrderBillInfoVo">
<select id="getBillInfo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderBillInfoVo">
SELECT customerSid,
customerName,
mobile AS customerMobile,

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@ -26,6 +26,7 @@
package com.yxt.anrui.buscenter.biz.bussalesorder;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;

54
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -41,9 +41,11 @@ import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
import com.yxt.anrui.base.api.busvehicleorder.AppOrderReadyCar;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
@ -80,7 +82,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@ -217,10 +218,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
PagerVo<BusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null);
List<BusSalesOrderVo> list = p.getRecords();
for (BusSalesOrderVo vo : list) {
ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(vo.getSid());
if (resultBean.getSuccess() && resultBean.getData() != null) {
SysFormStateVo formState = resultBean.getData();
vo.setNodeState(formState.getNodeState());
if (StringUtils.isNotBlank(vo.getNodeState())) {
vo.setNodeState(vo.getNodeState());
} else {
vo.setNodeState("待提交");
}
@ -349,14 +348,32 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
} else if ("2".equals(dto.getType())) {
//采购订单
List<BusSalesVehicleOrderDto> busSalesVehicleOrderList = dto.getBusSalesVehicleOrderList();
if(busSalesVehicleOrderList.size()>0){
if (busSalesVehicleOrderList.size() > 0) {
for (int i = 0; i < busSalesVehicleOrderList.size(); i++) {
if(busSalesVehicleOrderList.get(i) != null){
if(busSalesVehicleOrderList.get(i).getUsingNum()>busSalesVehicleOrderList.get(i).getUseNum()){
return rb.setMsg("本次使用台数不允许大于可使用台数");
if (busSalesVehicleOrderList.get(i) != null) {
//根据采购订单sid查询采购订单的可使用台数
ResultBean<BusVehicleOrderVo> busVehicleOrderVoResultBean = busVehicleOrderFeign.fetchBySid(busSalesVehicleOrderList.get(i).getLinkSid());
if (busVehicleOrderVoResultBean.getSuccess()) {
Integer useNum = 0;
String platformNo = busVehicleOrderVoResultBean.getData().getPlatformNo();
String lockingNum = busVehicleOrderVoResultBean.getData().getLockingNum();
if (StringUtils.isNotBlank(platformNo)) {
if (StringUtils.isNotBlank(lockingNum)) {
useNum = Integer.parseInt(platformNo) - Integer.parseInt(lockingNum);
}else{
useNum = Integer.parseInt(platformNo);
}
}
if (busSalesVehicleOrderList.get(i).getUsingNum() != null && useNum != 0) {
if (busSalesVehicleOrderList.get(i).getUsingNum() > useNum) {
return rb.setMsg("本次使用台数不允许大于可使用台数");
}
}
}
vehicleNum = vehicleNum + busSalesVehicleOrderList.get(i).getUsingNum();
}else{
} else {
return rb.setMsg("请选择采购订单数据");
}
@ -467,6 +484,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
return rb.success();
}
@Transactional(rollbackFor = Exception.class)
public void updateOrder(BusSalesOrderAllDto dto) {
//主车车型信息
@ -531,7 +549,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
busSalesOrderDepositService.updateOrderDepo(busSalesOrderDepositDto, dto.getSid());
BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(dto.getSid());
if(busSalesOrderDeposit != null){
if (busSalesOrderDeposit != null) {
if ("02".equals(busSalesOrderDepositDto.getDepositTypeKey())) {
//结转金额
busDepositFictitiousService.deleteByOrderSid(busSalesOrderDeposit.getSid());
@ -543,6 +561,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
@Transactional(rollbackFor = Exception.class)
public String save(BusSalesOrderAllDto dto) {
//主车车型信息
@ -609,6 +628,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
return sid;
}
@Transactional(rollbackFor = Exception.class)
public ResultBean submit(BusSalesOrderAllDto dto) {
ResultBean rb = ResultBean.fireFail();
@ -618,18 +638,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
String businessSid = resultBean.getData();
//保存提交时补充的内容
BusSalesOrderSubmitDto busSalesOrderSubmit = dto.getBusSalesOrderSubmit();
if(busSalesOrderSubmit != null){
if(StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPrice()) && StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPriceAll())){
if (busSalesOrderSubmit != null) {
if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPrice()) && StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPriceAll())) {
BigDecimal priceBig = new BigDecimal(busSalesOrderSubmit.getDistributorPrice());
BigDecimal priceAll = new BigDecimal(busSalesOrderSubmit.getDistributorPriceAll());
if(busSalesOrderSubmit.getNum() != null){
if(priceAll.compareTo(priceBig.multiply(new BigDecimal(busSalesOrderSubmit.getNum().toString()))) != 0){
if (busSalesOrderSubmit.getNum() != null) {
if (priceAll.compareTo(priceBig.multiply(new BigDecimal(busSalesOrderSubmit.getNum().toString()))) != 0) {
return rb.setMsg("返利合计计算错误");
}
}
}
busSalesOrderSubmitService.saveOrderSubmit(busSalesOrderSubmit,businessSid);
busSalesOrderSubmitService.saveOrderSubmit(busSalesOrderSubmit, businessSid);
}
Map<String, Object> variables = new HashMap<>();
@ -717,7 +737,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
for (int i = 0; i < vehicleList.size(); i++) {
//根据sid去查询销售政策的sid,根据销售政策查询销售政策的金额
ResultBean<BaseVehiclePriceVo> priceResultBean = baseVehiclePolicyFeign.selectPrice(vehicleList.get(i));
if(priceResultBean.getSuccess() && priceResultBean.getData() != null){
if (priceResultBean.getSuccess() && priceResultBean.getData() != null) {
String price = priceResultBean.getData().getDiscountMoney();
BigDecimal bigDecimal1 = new BigDecimal(price);
initBigDecimal = initBigDecimal.add(bigDecimal1);

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@ -28,7 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesordermodel;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.bussalesorder.AppOrderInfo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.AppOrderInfo;
import com.yxt.anrui.buscenter.api.bussalesordermodel.*;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@ -28,7 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.bussalesorder.AppNowCarList;
import com.yxt.anrui.buscenter.api.bussalesorder.app.AppNowCarList;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@ -28,7 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesvehicleorder;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.bussalesorder.AppReadyCarList;
import com.yxt.anrui.buscenter.api.bussalesorder.app.AppReadyCarList;
import com.yxt.anrui.buscenter.api.bussalesvehicleorder.*;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;

14
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue

@ -275,20 +275,6 @@ export default {
this.$refs['divPrint'].showInfo(row)
},
// ------------------
// ------------------
noClickclose() {
this.xiaodaijinrongfanganInfoShow = false
this.hetongdanganguanliAddShow = false
this.viewState = 1
},
//
handleCheckxiaodai() {
this.viewState = false
this.xiaodaijinrongfanganInfoShow = true
this.hetongdanganguanliAddShow = false
},
// ------------------
//
handleReset() {

125
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanAdd.vue

@ -340,7 +340,17 @@
</el-col>
<el-col :span="10">
<el-form-item>
<el-upload
:action="uploadAction"
:data="requestData"
:headers="accessToken"
:multiple="false"
:on-success="uploadSuccessHetong"
:show-file-list="false"
class="upload-demo"
>
<el-button size="small" type="primary">合同上传</el-button>
</el-upload>
</el-form-item>
</el-col>
</el-row>
@ -630,7 +640,20 @@
</el-table-column>
<el-table-column label="款项支付委托书" align="center">
<template slot-scope="scope">
<span>上传</span>
<el-form-item>
<el-upload
:action="uploadAction"
:data="requestData"
:headers="accessToken"
:multiple="false"
:on-success="uploadSuccessKuanxiang"
:show-file-list="false"
class="upload-demo"
v-model="scope.row.payPath"
>
<span class="bluezi">上传</span>
</el-upload>
</el-form-item>
</template>
</el-table-column>
</el-table>
@ -753,7 +776,8 @@
</el-table-column>
<el-table-column align="center" label="本次使用台数" prop="billNo">
<template slot-scope="scope">
<el-input-number v-model="scope.row.usingNum" @change="changeUsingNum(scope.row,scope.row.usingNum)"
<el-input-number v-model="scope.row.usingNum"
@change="changeUsingNum(scope.row,scope.row.usingNum)"
:min="1" :max="100" label="描述文字"/>
</template>
</el-table-column>
@ -796,7 +820,7 @@
@handleXuniList="selectXuniList"/>
<!-- 提交补充页面-->
<xiaoshoudingdan-submit v-show="relState == '3'" ref="divsubmit" @handleReturn="changeState"
@handleSubmit="submitPage" @returnHome="handleReturn"/>
@handleSubmit="submitPage" @returnHome="handleReturn('true')"/>
</div>
</template>
@ -814,6 +838,7 @@ import {
selectCount,
selectOrderCount
} from '@/api/salesManagement/orderManagement'
import {getStorage} from '@/utils/auth'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import xuanzekehu from "./relation/xuanzekehu";
@ -850,13 +875,25 @@ export default {
return time.getTime() < Date.now() - oneDay;
},
},
//
viewTitle: '',
state: '',
relState: '', // 1 2 3 1.1 1.2 2.1 2.2 2.3
// 4.1 5.1
dialogStatus: 'add',
index: 0,
// Start
userName: sessionStorage.getItem('name'),
//
accessToken: {
token: getStorage()
},
//
uploadAction: process.env.VUE_APP_BASE_API + '/base/file/upload',
requestData: {
departmentName: window.sessionStorage.getItem('userSid'),
staffSid: window.sessionStorage.getItem('staffSid')
},
// End
customerVisible: false,
xiancheVisible: false,
caigouVisible: false,
@ -946,6 +983,7 @@ export default {
modelSid: '', //sid
moreConfig: '', //
specialConfig: '', //
type: 0,
}, //
busSalesOrderPrice: {
plannedPickUpDate: '', //
@ -1112,7 +1150,9 @@ export default {
//
affiliatedCompanyChange(val) {
const choosetItem = this.guaKaoCompanyList.filter((item) => item.sid == val)
this.temp.affiliatedCompany = choosetItem[0].orgName
if (choosetItem.length > 0){
this.temp.affiliatedCompany = choosetItem[0].orgName
}
console.log('挂靠', this.temp.affiliatedCompany, '挂靠sid:', this.temp.affiliatedCompanySid)
},
//
@ -1261,7 +1301,6 @@ export default {
staffSid: window.sessionStorage.getItem('staffSid'), //sid
type: '', // 123
}
},
showAdd() {
this.relState = '1'
@ -1306,7 +1345,7 @@ export default {
modelConfigSid: this.temp.busSalesOrderModel.modelConfigSid, //sid
modelSid: this.temp.busSalesOrderModel.modelSid, //sid
staffSid: this.temp.staffSid, //sid
type: this.temp.type //
type: this.temp.busSalesOrderModel.type //
}
const caigouCount = {
configSid: this.temp.busSalesOrderModel.modelConfigSid, // sid
@ -1329,10 +1368,24 @@ export default {
this.getType()
},
handleChange(val) {
console.log(val);
},
// // ---------------- ----------------
//
uploadSuccessHetong(response, file) {
console.log('上传合同附件response:', response)
console.log('上传合同附件file:', file)
this.temp.busSalesOrderMakeup.contractPath = response.data.fullUrl
},
uploadSuccessKuanxiang(response, file) {
console.log('112233', scope.row.payPath)
console.log('上传款项附件response:', response)
console.log('上传款项附件file:', file)
// row.payPath = response.data.fullUrl
// console.log('payPath',row.payPath)
},
// ---------------- ----------------
//
oninput(val, limit = 0) {
@ -1364,9 +1417,11 @@ export default {
}
//
if (this.isXuanzeShow == '2') {
console.log('采购订单长度',this.temp.busSalesVehicleOrderList)
if (this.temp.busSalesVehicleOrderList.length > 0) {
const taishu = []
this.temp.busSalesVehicleOrderList.forEach((element) => {
console.log('采购订单本次使用的台数',element.usingNum)
if (element.usingNum !== undefined) {
taishu.push(element.usingNum)
}
@ -1542,19 +1597,24 @@ export default {
},
// 使
changeUsingNum(row, usingNum) {
if (usingNum !== undefined) {
if (Number(row.useNum) < Number(usingNum)) {
if (usingNum !== undefined && usingNum !== 0) {
if (Number(row.useNum) > Number(usingNum)) {
return usingNum
} else {
this.$message({
showClose: true,
message: '本次使用台数大于可使用台数,请重新输入!',
type: 'error'
});
return row.usingNum = 0
} else {
return usingNum
return
}
} else {
return row.usingNum = 0
this.$message({
showClose: true,
message: '请填写本次使用台数!',
type: 'error'
})
return
}
},
@ -1654,6 +1714,7 @@ export default {
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.relState = ''
this.isXuanzeShow = ''
this.temp = {
affiliatedCompany: '', //
affiliatedCompanySid: '', //sid
@ -1992,11 +2053,12 @@ export default {
},
//
getXiancheList() {
console.log('type',this.temp.busSalesOrderModel.type)
this.xiancheLoading = true
this.xiancheList.params.customerSid = this.temp.customerSid
this.xiancheList.params.modelConfigSid = this.temp.busSalesOrderModel.modelConfigSid
this.xiancheList.params.modelSid = this.temp.busSalesOrderModel.modelSid
this.xiancheList.params.type = this.temp.type
this.xiancheList.params.type = this.temp.busSalesOrderModel.type
const aa = []
this.temp.busSalesOrderVehicleList.forEach((element) => {
aa.push(element.linkSid)
@ -2063,6 +2125,7 @@ export default {
handleSelectionXianche(row) {
console.log('勾选现车数据', row)
this.xiancheChoice = row
},
//
handleSelectionCaigou(row) {
@ -2094,16 +2157,23 @@ export default {
selectionCaigou() {
if (this.caigouChoice.length > 0) {
for (var i = 0; i < this.caigouChoice.length; i++) {
if (this.caigouChoice[i].usingNum == 0 || this.caigouChoice[i].usingNum == undefined) {
if (this.caigouChoice[i].usingNum == 0 || this.caigouChoice[i].usingNum == undefined || this.caigouChoice[i].usingNum > this.caigouChoice[i].useNum) {
this.$message({
showClose: true,
message: '请填写本次使用台数!',
message: '本次使用台数填写不正确,请重新填写!',
type: 'error'
})
return
} else {
const caigouSids = []
this.temp.busSalesVehicleOrderList.push(this.caigouChoice[i])
console.log('123',this.caigouChoice[i])
// this.temp.busSalesVehicleOrderList.push(this.caigouChoice[i])
this.temp.busSalesVehicleOrderList.push({
linkNo: this.caigouChoice[i].linkNo,
linkSid: this.caigouChoice[i].linkSid,
linkText: this.caigouChoice[i].linkText,
usingNum: this.caigouChoice[i].usingNum
})
caigouSids.push(this.caigouChoice[i].linkSid)
this.caigouList.params.sidList = caigouSids
this.caigouVisible = false
@ -2143,11 +2213,10 @@ export default {
//
selectYixiang(modelData, type) {
console.log('意向车型', modelData)
this.xiancheList.params.type = type
this.modelData = modelData
this.temp.busSalesOrderModel = {
brandName: modelData.brandName,
brandSid: modelData.brandSid,
brandName: modelData.brandName, //
brandSid: modelData.brandSid, // sid
config: modelData.config, //
guildPrice: modelData.guidedPrice, //
modelConfig: modelData.modelName, //
@ -2157,8 +2226,8 @@ export default {
moreConfig: modelData.otherConfig, //
specialConfig: '',
finalPrice: '',
type: type,
}
this.temp.type = 1
const countList = {
customerSid: this.temp.customerSid, //sid
modelConfigSid: this.temp.busSalesOrderModel.modelConfigSid, //sid
@ -2183,12 +2252,9 @@ export default {
this.caigouCount = response.data
}
})
},
//
selectXuni(modelData, type) {
console.log('确定选择车型', modelData)
this.xiancheList.params.type = type
this.modelData = modelData
this.temp.busSalesOrderModel = {
brandName: modelData.brandName,
@ -2202,8 +2268,8 @@ export default {
moreConfig: modelData.otherConfig, //
specialConfig: '',
finalPrice: '',
type: type,
}
this.temp.type = 2
const countList = {
customerSid: this.temp.customerSid, //sid
modelConfigSid: this.temp.busSalesOrderModel.modelConfigSid, //sid
@ -2226,12 +2292,11 @@ export default {
this.caigouCount = response.data
}
})
},
//
selectChexing(modelData) {
console.log('选择车型', modelData)
this.xiancheList.params.type = 3
this.modelData = modelData
this.temp.busSalesOrderModel = {
brandName: modelData.brandName,
@ -2245,8 +2310,8 @@ export default {
moreConfig: modelData.moreConfig, //
specialConfig: '',
finalPrice: '',
type: 3,
}
this.temp.type = 3
//
const countList = {
customerSid: this.temp.customerSid, //sid

45
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue

@ -163,15 +163,20 @@
<div class="chosseBtn">
<el-row>
<el-col :span="4">
<span>{{ this.temp.vehicleType }}</span>
<span>{{ temp.vehicleType }}</span>
</el-col>
<el-col :span="20">
<!--放置五个车架号-->
<el-form-item>
<el-form-item v-if="temp.type == '1'">
<div class="linkNoSty" v-for="(item,index) in temp.busSalesOrderVehicleList">
<span>{{ item.linkNo }}</span>
</div>
</el-form-item>
<el-form-item v-if="temp.type == '2'">
<div class="linkNoSty" v-for="(item,index) in temp.busSalesVehicleOrderList">
<span>{{ item.linkNo }}</span>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
@ -260,7 +265,7 @@
</el-col>
<el-col :span="10">
<el-form-item>
<span>{{contractName}}</span>
</el-form-item>
</el-col>
</el-row>
@ -423,10 +428,10 @@
<!-- ==================== 消贷金融方案(暂不考虑) ======================================== -->
<div class="titleleft">
<span>消贷金融方案</span>
<div class="jinrongTit">
<span>单车方案编辑</span>
<span> 预览总方案</span>
</div>
<!-- <div class="jinrongTit">-->
<!-- <span>单车方案编辑</span>-->
<!-- <span> 预览总方案</span>-->
<!-- </div>-->
</div>
<!-- ==================== 订金信息 ======================================== -->
<div class="titleleft space_up">
@ -494,7 +499,7 @@
</el-table-column>
<el-table-column label="款项支付委托书" align="center">
<template slot-scope="scope">
<span>上传</span>
<span></span>
</template>
</el-table-column>
</el-table>
@ -528,6 +533,7 @@ export default {
tableKey2: 1,
tableKey3: 2,
tableKey4: 3,
contractName:'',
temp: {
billNo: '', //
affiliatedCompany: '', //
@ -658,27 +664,8 @@ export default {
}else if (this.temp.type == '3'){
this.temp.vehicleType = '排产'
}
//
// if (this.temp.isTop == '1') {
// this.checked = true
// } else if (this.temp.isTop == '0') {
// this.checked = false
// }
//
// this.isXuanzeShow = this.temp.type
// if (this.temp.isInsurance == '1') {
// this.checkedBaoxian = true
// } else if (this.temp.isInsurance == '0') {
// this.checkedBaoxian = false
// }
//
// if (this.temp.busSalesOrderDiscountList.length > 0) {
// this.activeNames.push('2')
// }
//
// if (this.isXuanzeShow == '3') {
// this.quantity = this.temp.busSalesOrderPrice.quantity
// }
const index = this.temp.busSalesOrderMakeup.contractPath.lastIndexOf('/')
this.contractName = this.temp.busSalesOrderMakeup.contractPath.substring(index + 1, this.temp.busSalesOrderMakeup.contractPath.length)
const countList = {
customerSid: this.temp.customerSid, //sid
modelConfigSid: this.temp.busSalesOrderModel.modelConfigSid, //sid

1
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanSubmit.vue

@ -453,6 +453,7 @@ export default {
},
showSubmit(temp, nodeState) {
this.temp = temp
console.log('提交时的temp',this.temp)
// this.temp.busSalesOrderSubmit = {
// priceRemarks: '', //
// discountRemarks: '', //

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -18,7 +18,7 @@ public enum ProcDefEnum {
SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:245028"),
SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
BASEVEHICLEACTUALSALES("未售买断", ""),//ToDo
SALESORDER("销售订单审批流程", "process_p5ils2rn:3:252512"),
SALESORDER("销售订单审批流程", "process_p5ils2rn:1:242504"),
BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:1:232504"),
;

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmmaterial/ScmMaterialDetailsVo.java

@ -17,7 +17,8 @@ public class ScmMaterialDetailsVo implements Vo {
private static final long serialVersionUID = -501888339245178616L;
@ApiModelProperty("使用组织sid全路径")
private String[][] useOrgSid;
private String useOrgSid;
@ApiModelProperty(value = "使用组织名称")
private String useOrg;

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmrealtimeinventory/ScmRealTimeInventoryVo.java

@ -74,7 +74,7 @@ public class ScmRealTimeInventoryVo implements Vo {
private String availableQuantity; // 可用量(主单位)
@ApiModelProperty("库存组织sid")
private String[][] stockOrgNameSid; // 库存组织sid
private String stockOrgNameSid; // 库存组织sid
@ApiModelProperty("库存组织")
private String stockOrgName; // 库存组织

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmreturn/ScmReturnVo.java

@ -78,7 +78,7 @@ public class ScmReturnVo implements Vo {
private String returnCustomer; // 退货客户
@ApiModelProperty("库存组织sid")
private String[][] stockOrgSid; // 库存组织sid
private String stockOrgSid; // 库存组织sid
@ApiModelProperty("库存组织")
private String stockOrgName; // 库存组织
@ -117,7 +117,7 @@ public class ScmReturnVo implements Vo {
private String warehouseKeeperName; // 仓管员
@ApiModelProperty("销售组织sid")
private String[][] salesOrgSid; // 销售组织sid
private String salesOrgSid; // 销售组织sid
@ApiModelProperty("销售组织")
private String salesOrgName; // 销售组织

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialMapper.xml

@ -53,6 +53,7 @@
SELECT sid,
<!--使用组织名称-->
useOrg,
useOrgSid,
createOrg,
createOrgSid,
remarks,

16
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialService.java

@ -165,23 +165,7 @@ public class ScmMaterialService extends MybatisBaseService<ScmMaterialMapper, Sc
* @return
*/
public ScmMaterialDetailsVo selectBySid(String sid) {
ScmMaterial scmMaterial = fetchBySid(sid);
ScmMaterialDetailsVo scmMaterialDetailsVo = baseMapper.selectBySid(sid);
if (StringUtils.isNotBlank(scmMaterial.getUseOrgSid())) {//使用组织sid
//将string类型转换为List类型
List<String> list = Arrays.asList(scmMaterial.getUseOrgSid().split(","));
String[][] s = new String[list.size()][];
for (int i = 0; i < list.size(); i++) {
String[] list1 = {};
//根据使用组织查询上级
ResultBean<SysOrganization> resultBean = sysOrganizationFeign.selectBySid(list.get(i));
if (resultBean.getSuccess()) {
list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
}
s[i] = list1;
}
scmMaterialDetailsVo.setUseOrgSid(s);
}
return scmMaterialDetailsVo;
}

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmrealtimeinventory/ScmRealTimeInventoryService.java

@ -182,7 +182,7 @@ public class ScmRealTimeInventoryService extends MybatisBaseService<ScmRealTimeI
ScmRealTimeInventory entity = this.fetchBySid(sid);
ScmRealTimeInventoryVo vo = new ScmRealTimeInventoryVo();
BeanUtil.copyProperties(entity, vo);
if (StringUtils.isNotBlank(entity.getStockOrgNameSid())) { //领料部门sid
/*if (StringUtils.isNotBlank(entity.getStockOrgNameSid())) { //领料部门sid
List<String> list = Arrays.asList(entity.getStockOrgNameSid().split(","));
String[][] s = new String[list.size()][];
for (int i = 0; i < list.size(); i++) {
@ -195,7 +195,7 @@ public class ScmRealTimeInventoryService extends MybatisBaseService<ScmRealTimeI
s[i] = list1;
}
vo.setStockOrgNameSid(s);
}
}*/
return vo;
}
}

30
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmreturn/ScmReturnService.java

@ -204,7 +204,7 @@ public class ScmReturnService extends MybatisBaseService<ScmReturnMapper, ScmRet
entity.setMakeListName(scmReturnSaveEchoVo.getStaffName());
entity.setCreateTime(scmReturnSaveEchoVo.getCreateTime());
boolean save = scmReturnService.save(entity);
if (save) {
if (save) {
//新增明细信息
List<ScmReturnDetailDto> list = dto.getList();
for (ScmReturnDetailDto scmReturnDetailDto : list) {
@ -352,20 +352,6 @@ public class ScmReturnService extends MybatisBaseService<ScmReturnMapper, ScmRet
List<ScmReturnDetailVo> list = scmReturnDetailService.details(sid);
scmReturnVo.setList(list);
}
if (StringUtils.isNotBlank(scmReturn.getStockOrgSid())) { //库存组织sid
List<String> list = Arrays.asList(scmReturn.getStockOrgSid().split(","));
String[][] s = new String[list.size()][];
for (int i = 0; i < list.size(); i++) {
String[] list1 = {};
//根据使用组织查询上级
ResultBean<SysOrganization> resultBean = sysOrganizationFeign.selectBySid(list.get(i));
if (resultBean.getSuccess()) {
list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
}
s[i] = list1;
}
scmReturnVo.setStockOrgSid(s);
}
if (StringUtils.isNotBlank(scmReturn.getStockDepSid())) { //库存部门sid
List<String> list = Arrays.asList(scmReturn.getStockDepSid().split(","));
String[][] s = new String[list.size()][];
@ -380,20 +366,6 @@ public class ScmReturnService extends MybatisBaseService<ScmReturnMapper, ScmRet
}
scmReturnVo.setStockDepSid(s);
}
if (StringUtils.isNotBlank(scmReturn.getSalesOrgSid())) { //销售组织sid
List<String> list = Arrays.asList(scmReturn.getSalesOrgSid().split(","));
String[][] s = new String[list.size()][];
for (int i = 0; i < list.size(); i++) {
String[] list1 = {};
//根据使用组织查询上级
ResultBean<SysOrganization> resultBean = sysOrganizationFeign.selectBySid(list.get(i));
if (resultBean.getSuccess()) {
list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
}
s[i] = list1;
}
scmReturnVo.setSalesOrgSid(s);
}
return rb.success().setData(scmReturnVo);
}

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@ -26,6 +26,7 @@
package com.yxt.anrui.terminal.api.autoservice.saleOrders;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@ -25,7 +25,7 @@
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice.saleOrders;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;

46
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractRest.java

@ -0,0 +1,46 @@
package com.yxt.anrui.terminal.biz.autoservice.contract;
import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.terminal.api.autoservice.contract.AppCommonContractFeign;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* Project: anrui-base(安瑞基础) <br/>
* File: CommonContractFeignFallback.java <br/>
* Class: com.yxt.anrui.base.biz.commoncontract.CommonContractRest <br/>
* Description: 合同表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-10-12 14:02:40 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "合同表")
@RestController
@RequestMapping("/autoservice/v1/contract")
public class AppCommonContractRest implements AppCommonContractFeign {
@Autowired
AppCommonContractService appCommonContractService;
@Override
@ApiOperation("移动端-合同审核列表")
public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
return appCommonContractService.getContractList(pagerQuery);
}
}

48
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractService.java

@ -0,0 +1,48 @@
package com.yxt.anrui.terminal.biz.autoservice.contract;
import com.yxt.anrui.base.api.commoncontract.*;
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;
/**
* Project: anrui-base(安瑞基础) <br/>
* File: CommonContractService.java <br/>
* Class: com.yxt.anrui.base.biz.commoncontract.CommonContractService <br/>
* Description: 合同表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-10-12 14:02:40 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class AppCommonContractService {
@Autowired
CommonContractFeign commonContractFeign;
/**
* 移动端-合同审核列表
*
* @param pagerQuery
* @return
*/
public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
ResultBean resultBean = commonContractFeign.getContractList(pagerQuery);
return resultBean;
}
}

104
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@ -0,0 +1,104 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign;
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.*;
/**
* Project: anrui-buscenter(业务管理) <br/>
* File: BusSalesOrderFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderRest <br/>
* Description: 销售订单主表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-27 13:39:04 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "销售订单主表")
@RestController("com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderRest")
@RequestMapping("/autoservice/v1/saleOrders")
public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
@Autowired
AppBusSalesOrderService appBusSalesOrderService;
/************************************* 销售订单接口 *********************************************/
@Override
@ApiOperation("初始化销售订单状态")
public ResultBean<AppBusSaleOrderStateVo> saleOrderState(String saleOrderSid) {
return appBusSalesOrderService.saleOrderState(saleOrderSid);
}
@Override
@ApiOperation("App销售订单分页列表")
public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
return appBusSalesOrderService.getSaleOrders(pq);
}
@Override
@ApiOperation("删除销售订单")
public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
return appBusSalesOrderService.deleteSaleOrder(saleOrderSid, userSid);
}
@Override
@ApiOperation("初始化销售订单单据信息")
public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
return appBusSalesOrderService.getBillInfo(saleOrderSid, userSid);
}
@Override
@ApiOperation("新增/修改销售订单单据")
public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
return appBusSalesOrderService.saveBillInfo(dto);
}
@Override
@ApiOperation("初始化销售订单 车型信息")
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
return appBusSalesOrderService.getInitModelInfo(saleOrderSid, customerSid, userSid);
}
@Override
@ApiOperation("初始化销售订单(第一次选择或重选) 车型信息")
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
return appBusSalesOrderService.getInitModelInfo2(special, customerSid, userSid, modelSid, configSid);
}
}

144
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@ -0,0 +1,144 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
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;
/**
* Project: anrui-buscenter(业务管理) <br/>
* File: BusSalesOrderService.java <br/>
* Class: com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService <br/>
* Description: 销售订单主表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-27 13:39:04 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class AppBusSalesOrderService {
@Autowired
BusSalesOrderFeign busSalesOrderFeign;
/************************************* 销售订单接口 *********************************************/
/**
* 初始化销售订单状态
*
* @param saleOrderSid
* @return
*/
public ResultBean<AppBusSaleOrderStateVo> saleOrderState(String saleOrderSid) {
ResultBean resultBean = busSalesOrderFeign.saleOrderState(saleOrderSid);
return resultBean;
}
/**
* App销售订单分页列表
*
* @param pq
* @return
*/
public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
ResultBean resultBean = busSalesOrderFeign.getSaleOrders(pq);
return resultBean;
}
/**
* 初始化销售订单单据信息
*
* @param saleOrderSid
* @param userSid
* @return
*/
public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
ResultBean resultBean = busSalesOrderFeign.getBillInfo(saleOrderSid, userSid);
return resultBean;
}
/**
* 新增/修改销售订单单据
*
* @param dto
* @return
*/
public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
ResultBean resultBean = busSalesOrderFeign.saveBillInfo(dto);
return resultBean;
}
/**
* 初始化销售订单 车型信息
*
* @param saleOrderSid
* @param customerSid
* @param userSid
* @return
*/
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
ResultBean resultBean = busSalesOrderFeign.getInitModelInfo(saleOrderSid, customerSid, userSid);
return resultBean;
}
/**
* 初始化销售订单(第一次选择或重选) 车型信息
*
* @param special
* @param customerSid
* @param userSid
* @param modelSid
* @param configSid
* @return
*/
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
ResultBean resultBean = busSalesOrderFeign.getInitModelInfo2(special, customerSid, userSid, modelSid, configSid);
return resultBean;
}
/**
* 删除销售订单
*
* @param saleOrderSid
* @param userSid
* @return
*/
public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
ResultBean resultBean = busSalesOrderFeign.deleteSaleOrder(saleOrderSid, userSid);
return resultBean;
}
}

1
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java

@ -33,6 +33,7 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.*;
import com.yxt.anrui.buscenter.api.busmaindeposit.*;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
import com.yxt.anrui.terminal.api.autoservice.virtualOrders.AppBusMainDepositPageQuery;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;

Loading…
Cancel
Save