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

销售订单调整 

价格策略对接
master
God 11 months ago
parent
1dda8719d5
commit
1d40894952
32 changed files with 301 additions and 241 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. 8
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java
  2. 9
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java
  3. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDetailsVo.java
  4. 165
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  5. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  6. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
  7. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java
  8. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
  9. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java
  10. 1
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
  11. 4
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java
  12. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyVo.java
  13. 4
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyMapper.xml
  14. 6
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java
  15. 18
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeChoiceVo.java
  16. 5
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java
  17. 6
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
  18. 8
      yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillDetailRest.java
  19. 2
      yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillRest.java
  20. 26
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBill.java
  21. 29
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDetailsVo.java
  22. 29
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDto.java
  23. 18
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillQuery.java
  24. 13
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillVo.java
  25. 2
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java
  26. 2
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDto.java
  27. 7
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.java
  28. 7
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml
  29. 63
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailQuery.java
  30. 9
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java
  31. 65
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailVo.java
  32. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java

8
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java
View File

@ -33,6 +33,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance
import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
import com.yxt.common.core.vo.Vo;
@ -109,6 +110,8 @@ public class BusSalesOrderDetailsVo implements Vo {
private String notes;
@ApiModelProperty("是否包含上装")
private String isTop;
@ApiModelProperty("是否包含挂车")
private Boolean isGc = false;
@ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产")
private String type;
private String nowCarUnknownVinNum;
@ -123,7 +126,10 @@ public class BusSalesOrderDetailsVo implements Vo {
private BusSalesOrderDepositDetailsVo busSalesOrderDeposit = new BusSalesOrderDepositDetailsVo();
@ApiModelProperty(value = "主车优惠明细")
private List<BusSalesOrderDiscountDetailsVo> busSalesOrderDiscountList = new ArrayList<>();
@ApiModelProperty(value = "挂车1")
private BusSalesOrderTrailerDetailsVo gc1 = new BusSalesOrderTrailerDetailsVo();
@ApiModelProperty(value = "挂车2")
private BusSalesOrderTrailerDetailsVo gc2 = new BusSalesOrderTrailerDetailsVo();
@ApiModelProperty(value = "现车车辆信息")
private List<BusSalesOrderVehicleDetailsVo> busSalesOrderVehicleList = new ArrayList<>();
@ApiModelProperty(value = "采购订单信息")

9
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java
View File

@ -52,6 +52,13 @@ public class AppOrderPriceInfoVo implements Vo {
@ApiModelProperty("差额")
private String diffPrice;
@ApiModelProperty("挂车1销售合同价")
private String gcOneConPrice;
@ApiModelProperty("挂车1台数")
private String gcOneCount;
@ApiModelProperty("挂车2销售合同价")
private String gcTwoConPrice;
@ApiModelProperty("挂车2台数")
private String gcTwoCount;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDetailsVo.java
View File

@ -72,4 +72,6 @@ public class BusSalesOrderPriceDetailsVo implements Vo {
private String plannedPickUpLocationKey;
@ApiModelProperty("计划提车地点")
private String plannedPickUpLocation;
@ApiModelProperty("其中上装")
private String topPrice;
}

165
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -104,6 +104,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer;
import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo;
@ -429,6 +430,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
/***************************车型信息***************************************/
AppOrderModelInfoVo modelInfo = busSalesOrderModelService.selectModel(sid);
if (modelInfo != null) {
if (modelInfo.getModelName().contains("牵引车")){
vo.setIsGc(true);
}
//若前端传值的订单类型为0则为现车，为1采购订单，为2排产
//数据库中1为现车，2为采购订单，3为排产
if ("0".equals(modelInfo.getType())) {
@ -475,6 +479,82 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
// vo.setModelInfoVo(modelInfo);
}
/*************************************************挂车信息*****************************************************/
List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(sid);
if (busSalesOrderTrailerDetailsVos.size() == 1){
BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo = busSalesOrderTrailerDetailsVos.get(0);
BusSalesOrderTrailer busSalesOrderTrailer = busSalesOrderTrailerService.fetchBySid(busSalesOrderTrailerDetailsVo.getSid());
String certFile = busSalesOrderTrailer.getCertFile();
String[] certFiles = certFile.split(",");
List<BusSalesOrderTrailerFile> certFiless = new ArrayList<>();
for (String path : certFiles) {
String url = fileUploadComponent.getUrlPrefix() + path;
BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
busSalesOrderTrailerFile.setUrl(url);
certFiless.add(busSalesOrderTrailerFile);
}
busSalesOrderTrailerDetailsVo.setCertFile(certFiless);
String contractFile = busSalesOrderTrailer.getContractFile();
String[] contractFiles = contractFile.split(",");
List<BusSalesOrderTrailerFile> contractFiless = new ArrayList<>();
for (String path : contractFiles) {
String url = fileUploadComponent.getUrlPrefix() + path;
BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
busSalesOrderTrailerFile.setUrl(url);
contractFiless.add(busSalesOrderTrailerFile);
}
busSalesOrderTrailerDetailsVo.setContractFile(contractFiless);
vo.setGc1(busSalesOrderTrailerDetailsVo);
}else if (busSalesOrderTrailerDetailsVos.size() == 2){
//挂车1
BusSalesOrderTrailerDetailsVo gc1 = busSalesOrderTrailerDetailsVos.get(0);
BusSalesOrderTrailer gcst1 = busSalesOrderTrailerService.fetchBySid(gc1.getSid());
String certFile1 = gcst1.getCertFile();
String[] certFiles1 = certFile1.split(",");
List<BusSalesOrderTrailerFile> certFiless1 = new ArrayList<>();
for (String path : certFiles1) {
String url = fileUploadComponent.getUrlPrefix() + path;
BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
busSalesOrderTrailerFile.setUrl(url);
certFiless1.add(busSalesOrderTrailerFile);
}
gc1.setCertFile(certFiless1);
String contractFile1 = gcst1.getContractFile();
String[] contractFiles1 = contractFile1.split(",");
List<BusSalesOrderTrailerFile> contractFiless1 = new ArrayList<>();
for (String path : contractFiles1) {
String url = fileUploadComponent.getUrlPrefix() + path;
BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
busSalesOrderTrailerFile.setUrl(url);
contractFiless1.add(busSalesOrderTrailerFile);
}
gc1.setContractFile(contractFiless1);
//挂车2
BusSalesOrderTrailerDetailsVo gc2 = busSalesOrderTrailerDetailsVos.get(1);
BusSalesOrderTrailer gcst2 = busSalesOrderTrailerService.fetchBySid(gc2.getSid());
String certFile2 = gcst2.getCertFile();
String[] certFiles2 = certFile2.split(",");
List<BusSalesOrderTrailerFile> certFiless2 = new ArrayList<>();
for (String path : certFiles2) {
String url = fileUploadComponent.getUrlPrefix() + path;
BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
busSalesOrderTrailerFile.setUrl(url);
certFiless2.add(busSalesOrderTrailerFile);
}
gc2.setCertFile(certFiless2);
String contractFile2 = gcst1.getContractFile();
String[] contractFiles2 = contractFile2.split(",");
List<BusSalesOrderTrailerFile> contractFiless2 = new ArrayList<>();
for (String path : contractFiles2) {
String url = fileUploadComponent.getUrlPrefix() + path;
BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile();
busSalesOrderTrailerFile.setUrl(url);
contractFiless2.add(busSalesOrderTrailerFile);
}
gc2.setContractFile(contractFiless2);
vo.setGc1(gc1);
vo.setGc2(gc2);
}
/*************************************************补充说明附件*****************************************************/
String imagesFile = entity.getImagesFile();
if (StringUtils.isNotBlank(imagesFile)) {
@ -676,6 +756,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
priceAll = "￥" + all.toString();
}
busSalesOrderPriceDetailsVo.setBigDecimalSing(priceAll);
//查询挂车和上装的总价
BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(sid);
if (busSalesOrderMakeupDetailsVo != null) {
String topPrice = busSalesOrderMakeupDetailsVo.getTopPrice();
if(StringUtils.isNotBlank(topPrice)){
busSalesOrderPriceDetailsVo.setTopPrice(topPrice);
}else {
busSalesOrderPriceDetailsVo.setTopPrice("0");
}
}else {
busSalesOrderPriceDetailsVo.setTopPrice("0");
}
vo.setBusSalesOrderPrice(busSalesOrderPriceDetailsVo);
/***************************保险信息***************************************/
BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance = busSalesOrderInsuranceService.details(sid);
@ -3770,13 +3862,57 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
vo.setModelInfo(modelInfo);
}
/***************************挂车信息***************************************/
List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(sid);
List<AppOrderTrailerInfoVo> appOrderTrailerInfoVos = new ArrayList<>();
for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) {
AppOrderTrailerInfoVo appOrderTrailerInfoVo = new AppOrderTrailerInfoVo();
BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo,appOrderTrailerInfoVo,"contractFile","certFile");
List<BusSalesOrderTrailerFile> contractFile = busSalesOrderTrailerDetailsVo.getContractFile();
List<BusSalesOrderTrailerFile> certFile = busSalesOrderTrailerDetailsVo.getCertFile();
ArrayList<String> contractFileString = new ArrayList<>();
ArrayList<String> certFileString = new ArrayList<>();
for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : contractFile) {
contractFileString.add(busSalesOrderTrailerFile.getUrl());
}
for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : certFile) {
certFileString.add(busSalesOrderTrailerFile.getUrl());
}
appOrderTrailerInfoVo.setContractFile(contractFileString);
appOrderTrailerInfoVo.setCertFile(certFileString);
appOrderTrailerInfoVo.setAppearanceSizeLong("长" + appOrderTrailerInfoVo.getAppearanceSizeLong() + "m");
appOrderTrailerInfoVo.setTotalPrice(appOrderTrailerInfoVo.getSingleFinalPrice().multiply(new BigDecimal(appOrderTrailerInfoVo.getTrailerCount())));
appOrderTrailerInfoVos.add(appOrderTrailerInfoVo);
}
for (int i = 0; i < appOrderTrailerInfoVos.size(); i++) {
AppOrderTrailerInfoVo appOrderTrailerInfoVo = appOrderTrailerInfoVos.get(i);
if (appOrderTrailerInfoVos.size() == 1){
appOrderTrailerInfoVo.setTrailerName("挂车");
}else {
appOrderTrailerInfoVo.setTrailerName("挂车" + (i + 1));
}
}
vo.setTrailerInfo(appOrderTrailerInfoVos);
/***************************价格信息***************************************/
AppOrderPriceInfoVo priceInfo = busSalesOrderPriceService.selectPrice(sid);
if (priceInfo != null) {
if (vo.getModelInfo() != null) {
priceInfo.setTransactionPrice(vo.getModelInfo().getPrice());
}
if (appOrderTrailerInfoVos.size() == 1){
priceInfo.setGcOneConPrice(appOrderTrailerInfoVos.get(0).getSingleFinalPrice().toString());
priceInfo.setGcOneCount(appOrderTrailerInfoVos.get(0).getTrailerCount().toString());
}else if (appOrderTrailerInfoVos.size() == 2){
priceInfo.setGcOneConPrice(appOrderTrailerInfoVos.get(0).getSingleFinalPrice().toString());
priceInfo.setGcOneCount(appOrderTrailerInfoVos.get(0).getTrailerCount().toString());
priceInfo.setGcTwoConPrice(appOrderTrailerInfoVos.get(1).getSingleFinalPrice().toString());
priceInfo.setGcTwoCount(appOrderTrailerInfoVos.get(1).getTrailerCount().toString());
}else {
priceInfo.setGcOneConPrice("");
priceInfo.setGcOneCount("");
priceInfo.setGcTwoConPrice("");
priceInfo.setGcTwoCount("");
}
vo.setPriceInfo(priceInfo);
}
/***************************上装信息***************************************/
@ -3851,33 +3987,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
vo.setTopMessage(topMessage);
}
/***************************挂车信息***************************************/
List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(sid);
List<AppOrderTrailerInfoVo> appOrderTrailerInfoVos = new ArrayList<>();
for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) {
AppOrderTrailerInfoVo appOrderTrailerInfoVo = new AppOrderTrailerInfoVo();
BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo,appOrderTrailerInfoVo,"contractFile","certFile");
List<BusSalesOrderTrailerFile> contractFile = busSalesOrderTrailerDetailsVo.getContractFile();
List<BusSalesOrderTrailerFile> certFile = busSalesOrderTrailerDetailsVo.getCertFile();
ArrayList<String> contractFileString = new ArrayList<>();
ArrayList<String> certFileString = new ArrayList<>();
for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : contractFile) {
contractFileString.add(busSalesOrderTrailerFile.getUrl());
}
for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : certFile) {
certFileString.add(busSalesOrderTrailerFile.getUrl());
}
appOrderTrailerInfoVo.setContractFile(contractFileString);
appOrderTrailerInfoVo.setCertFile(certFileString);
appOrderTrailerInfoVo.setAppearanceSizeLong("长" + appOrderTrailerInfoVo.getAppearanceSizeLong() + "m");
appOrderTrailerInfoVo.setTotalPrice(appOrderTrailerInfoVo.getSingleFinalPrice().multiply(new BigDecimal(appOrderTrailerInfoVo.getTrailerCount())));
appOrderTrailerInfoVos.add(appOrderTrailerInfoVo);
}
for (int i = 0; i < appOrderTrailerInfoVos.size(); i++) {
AppOrderTrailerInfoVo appOrderTrailerInfoVo = appOrderTrailerInfoVos.get(i);
appOrderTrailerInfoVo.setTrailerName("挂车" + (i + 1));
}
vo.setTrailerInfo(appOrderTrailerInfoVos);
/***************************主车优惠***************************************/
List<AppOrderDiscountListVo> discountList = busSalesOrderDiscountService.selectDiscount(sid);
discountList.removeAll(Collections.singleton(null));

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
View File

@ -238,6 +238,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderModel.setBrandName(brandName);
busSalesOrderModel.setModelConfig(modelAlias);
updateById(busSalesOrderModel);
if (!busSalesOrderModel.getModelName().contains("牵引车")){
busSalesOrderTrailerService.delByOrderSid(salesOrderSid);
}
}
//现车下不确定车架号的车辆数量
String nowCarUnknownVinNum = orderInfo.getNowCarUnknownVinNum();

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
View File

@ -154,7 +154,11 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
if(StringUtils.isNotBlank(topPrice)){
vo.setTopAndTrailerPrice(topPrice);
bigDecimalFinalPrice = bigDecimalFinalPrice.add(new BigDecimal(topPrice));
}else {
vo.setTopAndTrailerPrice("0");
}
}else {
vo.setTopAndTrailerPrice("0");
}
}else{
return rb.setMsg("请先完善车型信息");

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java
View File

@ -92,7 +92,7 @@ public interface FinBillFileMapper extends BaseMapper<FinBillFile> {
@Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '006'")
List<FinBillFileVo> fetchqklpfjBySid(String sid);
@Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '007'")
@Select("select * from fin_bill_file where billAppSid = #{sid} and (attachType = '007' OR attachType = '002')")
List<FinBillFileVo> fetchclmmhtBySid(String sid);
List<FinBillFileVo> fetchFileByBillSid(@Param("sid") String sid);

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
View File

@ -660,9 +660,11 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
}
String vinNo = dto.getVin();
int countByVinNo = baseMapper.getCountByVinNo(vinNo, orgSid);
if (!"004".equals(dto.getPurchaseKey())){
if (countByVinNo > 0) {
return rb.setMsg("该车架号已存在，请勿重复验车！");
}
}
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();
String s1 = "";

9
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java
View File

@ -48,4 +48,13 @@ public class OrderPriceInfoVo implements Vo {
private String realPrice;
@ApiModelProperty("差额")
private String diffPrice;
@ApiModelProperty("挂车1销售合同价")
private String gcOneConPrice;
@ApiModelProperty("挂车1台数")
private String gcOneCount;
@ApiModelProperty("挂车2销售合同价")
private String gcTwoConPrice;
@ApiModelProperty("挂车2台数")
private String gcTwoCount;
}

1
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
View File

@ -1090,6 +1090,7 @@ public class AppBusAdvanceGinvoiceapplyService {
vo.setFinBillTrailers(finBillTrailerVos);
//附件信息
List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs();
List<FinBillFileVo> carBuyContractImages = finBillApplicationDetailsVo.getCarBuyContractImages();
List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs();
List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs();
List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs();

4
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java
View File

@ -973,8 +973,12 @@ public class AppBusSalesOrderService {
}
for (int i = 0; i < appSalesOrderTrailerDetailsVos.size(); i++) {
AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = appSalesOrderTrailerDetailsVos.get(i);
if (appSalesOrderTrailerDetailsVos.size() == 1){
appSalesOrderTrailerDetailsVo.setTrailerName("挂车");
}else {
appSalesOrderTrailerDetailsVo.setTrailerName("挂车" + (i + 1));
}
}
trailerVo.setRecords(appSalesOrderTrailerDetailsVos);
trailerVo.setTotal(total);
return rb.success().setData(trailerVo);

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyVo.java
View File

@ -31,6 +31,10 @@ public class AsBusclaimCheckApplyVo {
@ApiModelProperty("办结日期")
private String closeDate;
private String file;
@ApiModelProperty("实例id")
private String procInstId;
@ApiModelProperty("流程定义id")
private String procDefId;
private List<String> fileList = new ArrayList<>();
}

4
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyMapper.xml
View File

@ -10,7 +10,9 @@
a.createByName,
DATE_FORMAT(a.createTime, '%Y-%m-%d') as createTime,
a.closeDate,
a.file
a.file,
a.procInstId,
a.procDefId
from as_busclaim_check_apply a
LEFT JOIN anrui_portal.sys_organization AS s ON a.deptSid = s.sid
<where>

6
yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java
View File

@ -35,6 +35,12 @@ public class BaseGoodsTypeRest {
return baseGoodsTypeService.listAll(query);
}
@ApiOperation("根据部门sid查询类别")
@PostMapping("/selectByUseOrgSid")
public ResultBean<List<BaseGoodsTypeChoiceVo>> selectByUseOrgSid(@RequestParam String deptSid) {
return baseGoodsTypeService.selectByUseOrgSid(deptSid);
}
@ApiOperation("保存修改")
@PostMapping("/saveOrUpdate")
public ResultBean<String> saveOrUpdate(@RequestBody BaseGoodsTypeDto dto) {

18
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeChoiceVo.java
View File

@ -0,0 +1,18 @@
package com.yxt.base.biz.base.basegoodstype;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
import java.util.Date;
/**
* @author wangpengfei
* @date 2024/2/26 13:37
*/
@Data
public class BaseGoodsTypeChoiceVo{
private String sid;
private String goodsTypeName;//商品类别名称
private String goodsTypeCode;//类别编码
}

5
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java
View File

@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.common.core.result.ResultBean;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@ -23,4 +25,7 @@ public interface BaseGoodsTypeMapper extends BaseMapper<BaseGoodsType> {
BaseGoodsType checkForUpdate(@Param("goodsTypeCode")String goodsTypeCode,@Param("deptSid") String useOrgSid, @Param("sid")String sid);
List<BaseGoodsType> selListAll(@Param(Constants.WRAPPER) QueryWrapper<BaseGoodsType> qw);
@Select("select * from base_goods_type where useOrgSid = #{deptSid}")
List<BaseGoodsTypeChoiceVo> selectByUseOrgSid(String deptSid);
}

6
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
View File

@ -304,4 +304,10 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
}
return rb.success().setMsg("成功");
}
public ResultBean<List<BaseGoodsTypeChoiceVo>> selectByUseOrgSid(String deptSid) {
ResultBean rb = ResultBean.fireFail();
List<BaseGoodsTypeChoiceVo> baseGoodsTypeChoiceVos = baseMapper.selectByUseOrgSid(deptSid);
return rb.success().setData(baseGoodsTypeChoiceVos);
}
}

8
yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillDetailRest.java
View File

@ -55,14 +55,6 @@ public class SmsPricestrategyBillDetailRest {
@Autowired
private SmsPricestrategyBillDetailService smsPricestrategyBillDetailService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<SmsPricestrategyBillDetailVo>> listPage(@RequestBody PagerQuery<SmsPricestrategyBillDetailQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<SmsPricestrategyBillDetailVo> pv = smsPricestrategyBillDetailService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody SmsPricestrategyBillDetailDto dto){

2
yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillRest.java
View File

@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Api(tags = "价格策略申请")
@RestController
@RequestMapping("/apiadmin/sms/smspricestrategybill")
@RequestMapping("v1/smspricestrategybill")
public class SmsPricestrategyBillRest {
@Autowired

26
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBill.java
View File

@ -26,11 +26,14 @@
package com.yxt.sms.biz.smspricestrategybill;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategyBill.java <br/>
@ -54,15 +57,26 @@ public class SmsPricestrategyBill extends BaseEntity {
private String createByName; // 制单人姓名
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("发起部门sid")
private String createDeptsid; // 发起部门sid
@ApiModelProperty("发起部门名称")
private String createDeptName; // 发起部门名称
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("组织sid")
private String useOrgSid; // 组织sid
@ApiModelProperty("组织名称")
private String useOrgName; // 组织名称
@ApiModelProperty("组织全路径")
private String orgSidPath; // 组织全路径
}

29
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDetailsVo.java
View File

@ -26,6 +26,7 @@
package com.yxt.sms.biz.smspricestrategybill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailDetailsVo;
@ -34,6 +35,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@ -55,20 +57,35 @@ public class SmsPricestrategyBillDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("制单人sid")
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("发起部门sid")
private String createDeptsid; // 发起部门sid
@ApiModelProperty("发起部门名称")
private String createDeptName; // 发起部门名称
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("组织sid")
private String useOrgSid; // 组织sid
@ApiModelProperty("组织名称")
private String useOrgName; // 组织名称
@ApiModelProperty("组织全路径")
private String orgSidPath; // 组织全路径
@ApiModelProperty("价格策略明细")
private List<SmsPricestrategyBillDetailDetailsVo> smsPricestrategyBillDetailList;
}

29
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDto.java
View File

@ -26,6 +26,7 @@
package com.yxt.sms.biz.smspricestrategybill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailDto;
@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@ -54,20 +56,35 @@ public class SmsPricestrategyBillDto implements Dto {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("制单人sid")
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("发起部门sid")
private String createDeptsid; // 发起部门sid
@ApiModelProperty("发起部门名称")
private String createDeptName; // 发起部门名称
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("组织sid")
private String useOrgSid; // 组织sid
@ApiModelProperty("组织名称")
private String useOrgName; // 组织名称
@ApiModelProperty("组织全路径")
private String orgSidPath; // 组织全路径
@ApiModelProperty("价格策略明细")
private List<SmsPricestrategyBillDetailDto> smsPricestrategyBillDetailList;
}

18
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillQuery.java
View File

@ -49,19 +49,9 @@ import lombok.Data;
@ApiModel(value = "价格策略申请 查询条件", description = "价格策略申请 查询条件")
public class SmsPricestrategyBillQuery implements Query {
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("发起部门sid")
private String createDeptsid; // 发起部门sid
@ApiModelProperty("发起部门名称")
private String createDeptName; // 发起部门名称
@ApiModelProperty("组织sid")
private String useOrgSid; // 组织sid
@ApiModelProperty("组织名称")
private String useOrgName; // 组织名称
@ApiModelProperty("组织全路径")
private String orgSidPath; // 组织全路径
private String orgPath;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
}

13
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillVo.java
View File

@ -55,15 +55,12 @@ public class SmsPricestrategyBillVo implements Vo {
private String createByName; // 制单人姓名
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("发起部门sid")
private String createDeptsid; // 发起部门sid
@ApiModelProperty("发起部门名称")
private String createDeptName; // 发起部门名称
@ApiModelProperty("组织sid")
private String useOrgSid; // 组织sid
private String deptName; // 发起部门名称
@ApiModelProperty("组织名称")
private String useOrgName; // 组织名称
@ApiModelProperty("组织全路径")
private String orgSidPath; // 组织全路径
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("流程实例的sid")
private String procInstId;
}

2
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java
View File

@ -51,8 +51,6 @@ public class SmsPricestrategyBillDetailDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("申请单sid")
private String mainSid; // 申请单sid
@ApiModelProperty("商品类别sid")

2
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDto.java
View File

@ -51,8 +51,6 @@ public class SmsPricestrategyBillDetailDto implements Dto {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("申请单sid")
private String mainSid; // 申请单sid
@ApiModelProperty("商品类别sid")

7
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.java
View File

@ -52,13 +52,6 @@ import java.util.List;
@Mapper
public interface SmsPricestrategyBillDetailMapper extends BaseMapper<SmsPricestrategyBillDetail> {
IPage<SmsPricestrategyBillDetailVo> selectPageVo(IPage<SmsPricestrategyBillDetail> page, @Param(Constants.WRAPPER) Wrapper<SmsPricestrategyBillDetail> qw);
List<SmsPricestrategyBillDetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SmsPricestrategyBillDetail> qw);
@Select("select * from sms_pricestrategy_bill_detail")
List<SmsPricestrategyBillDetailVo> selectListVo();
@Delete("delete from sms_pricestrategy_bill_detail where mainSid = #{mainSid}")
void delByMainSid(String mainSid);

7
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml
View File

@ -3,11 +3,4 @@
<mapper namespace="com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailVo">
SELECT * FROM sms_pricestrategy_bill_detail <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailVo">
SELECT * FROM sms_pricestrategy_bill_detail <where> ${ew.sqlSegment} </where>
</select>
</mapper>

63
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailQuery.java
View File

@ -1,63 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.sms.biz.smspricestrategybilldetail;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategyBillDetailQuery.java <br/>
* Class: com.yxt.sms.api.smspricestrategybilldetail.SmsPricestrategyBillDetailQuery <br/>
* Description: 价格策略申请明细 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "价格策略申请明细 查询条件", description = "价格策略申请明细 查询条件")
public class SmsPricestrategyBillDetailQuery implements Query {
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("申请单sid")
private String mainSid; // 申请单sid
@ApiModelProperty("商品类别sid")
private String goodsTypeSid; // 商品类别sid
@ApiModelProperty("商品类别名称")
private String goodsTypeName; // 商品类别名称
@ApiModelProperty("价格策略类别(固定比例0、价格区间1)")
private Integer strategyType; // 价格策略类别(固定比例0、价格区间1)
}

9
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java
View File

@ -54,15 +54,6 @@ import java.util.List;
@Service
public class SmsPricestrategyBillDetailService extends MybatisBaseService<SmsPricestrategyBillDetailMapper, SmsPricestrategyBillDetail> {
public PagerVo<SmsPricestrategyBillDetailVo> listPageVo(PagerQuery<SmsPricestrategyBillDetailQuery> pq) {
SmsPricestrategyBillDetailQuery query = pq.getParams();
QueryWrapper<SmsPricestrategyBillDetail> qw = new QueryWrapper<>();
IPage<SmsPricestrategyBillDetail> page = PagerUtil.queryToPage(pq);
IPage<SmsPricestrategyBillDetailVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<SmsPricestrategyBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(SmsPricestrategyBillDetailDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {

65
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailVo.java
View File

@ -1,65 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.sms.biz.smspricestrategybilldetail;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategyBillDetailVo.java <br/>
* Class: com.yxt.sms.api.smspricestrategybilldetail.SmsPricestrategyBillDetailVo <br/>
* Description: 价格策略申请明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "价格策略申请明细 视图数据对象", description = "价格策略申请明细 视图数据对象")
public class SmsPricestrategyBillDetailVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("申请单sid")
private String mainSid; // 申请单sid
@ApiModelProperty("商品类别sid")
private String goodsTypeSid; // 商品类别sid
@ApiModelProperty("商品类别名称")
private String goodsTypeName; // 商品类别名称
@ApiModelProperty("价格策略类别(固定比例0、价格区间1)")
private Integer strategyType; // 价格策略类别(固定比例0、价格区间1)
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java
View File

@ -52,7 +52,7 @@ import java.util.List;
*/
@Api(tags = "库存盘点")
@RestController
@RequestMapping("/apiadmin/inventory/wmsinventorycheckbill")
@RequestMapping("v1/wmsinventorycheckbill")
public class WmsInventoryCheckbillRest {
@Autowired

Write Preview
Loading…
Cancel
Save