From 1d4089495270d9a5fffd6c0eb9b66fddaf66a71f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 30 May 2024 18:18:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=E4=BB=B7=E6=A0=BC=E7=AD=96=E7=95=A5=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderDetailsVo.java | 8 +- .../app/order/AppOrderPriceInfoVo.java | 9 +- .../BusSalesOrderPriceDetailsVo.java | 2 + .../bussalesorder/BusSalesOrderService.java | 165 +++++++++++++++--- .../BusSalesOrderModelService.java | 3 + .../BusSalesOrderPriceService.java | 4 + .../biz/finbillfile/FinBillFileMapper.java | 2 +- .../ScmVehicleExamineService.java | 6 +- .../saleOrders/order/OrderPriceInfoVo.java | 9 + .../AppBusAdvanceGinvoiceapplyService.java | 1 + .../saleOrders/AppBusSalesOrderService.java | 6 +- .../AsBusclaimCheckApplyVo.java | 4 + .../AsBusclaimCheckApplyMapper.xml | 4 +- .../base/apiadmin/base/BaseGoodsTypeRest.java | 6 + .../basegoodstype/BaseGoodsTypeChoiceVo.java | 18 ++ .../basegoodstype/BaseGoodsTypeMapper.java | 5 + .../basegoodstype/BaseGoodsTypeService.java | 6 + .../SmsPricestrategyBillDetailRest.java | 8 - .../apiadmin/SmsPricestrategyBillRest.java | 2 +- .../SmsPricestrategyBill.java | 26 ++- .../SmsPricestrategyBillDetailsVo.java | 29 ++- .../SmsPricestrategyBillDto.java | 29 ++- .../SmsPricestrategyBillQuery.java | 20 +-- .../SmsPricestrategyBillVo.java | 13 +- .../SmsPricestrategyBillDetailDetailsVo.java | 2 - .../SmsPricestrategyBillDetailDto.java | 2 - .../SmsPricestrategyBillDetailMapper.java | 7 - .../SmsPricestrategyBillDetailMapper.xml | 7 - .../SmsPricestrategyBillDetailQuery.java | 63 ------- .../SmsPricestrategyBillDetailService.java | 9 - .../SmsPricestrategyBillDetailVo.java | 65 ------- .../inventroy/WmsInventoryCheckbillRest.java | 2 +- 32 files changed, 301 insertions(+), 241 deletions(-) create mode 100644 yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeChoiceVo.java delete mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailQuery.java delete mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailVo.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java index e701ea1f94..09ddc909d5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java @@ -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 busSalesOrderDiscountList = new ArrayList<>(); - + @ApiModelProperty(value = "挂车1") + private BusSalesOrderTrailerDetailsVo gc1 = new BusSalesOrderTrailerDetailsVo(); + @ApiModelProperty(value = "挂车2") + private BusSalesOrderTrailerDetailsVo gc2 = new BusSalesOrderTrailerDetailsVo(); @ApiModelProperty(value = "现车车辆信息") private List busSalesOrderVehicleList = new ArrayList<>(); @ApiModelProperty(value = "采购订单信息") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java index 5f8a88ca89..018cc71747 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java @@ -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; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDetailsVo.java index c767689cda..ce05a2be40 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDetailsVo.java @@ -72,4 +72,6 @@ public class BusSalesOrderPriceDetailsVo implements Vo { private String plannedPickUpLocationKey; @ApiModelProperty("计划提车地点") private String plannedPickUpLocation; + @ApiModelProperty("其中上装") + private String topPrice; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 034f4c0b11..345f3c55f9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -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 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 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 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 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 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 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 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 busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(sid); + List appOrderTrailerInfoVos = new ArrayList<>(); + for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) { + AppOrderTrailerInfoVo appOrderTrailerInfoVo = new AppOrderTrailerInfoVo(); + BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo,appOrderTrailerInfoVo,"contractFile","certFile"); + List contractFile = busSalesOrderTrailerDetailsVo.getContractFile(); + List certFile = busSalesOrderTrailerDetailsVo.getCertFile(); + ArrayList contractFileString = new ArrayList<>(); + ArrayList 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 busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(sid); - List appOrderTrailerInfoVos = new ArrayList<>(); - for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) { - AppOrderTrailerInfoVo appOrderTrailerInfoVo = new AppOrderTrailerInfoVo(); - BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo,appOrderTrailerInfoVo,"contractFile","certFile"); - List contractFile = busSalesOrderTrailerDetailsVo.getContractFile(); - List certFile = busSalesOrderTrailerDetailsVo.getCertFile(); - ArrayList contractFileString = new ArrayList<>(); - ArrayList 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 discountList = busSalesOrderDiscountService.selectDiscount(sid); discountList.removeAll(Collections.singleton(null)); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java index 57bcdb87ae..41dbd3e730 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java @@ -238,6 +238,9 @@ public class BusSalesOrderModelService extends MybatisBaseService { @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '006'") List 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 fetchclmmhtBySid(String sid); List fetchFileByBillSid(@Param("sid") String sid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index 1cca55412c..7796ec5750 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -660,8 +660,10 @@ public class ScmVehicleExamineService extends MybatisBaseService 0) { - return rb.setMsg("该车架号已存在，请勿重复验车！"); + 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(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java index 553ebea718..1fbfaffd0e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java @@ -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; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index 9598cc56e6..b189f7fde8 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -1090,6 +1090,7 @@ public class AppBusAdvanceGinvoiceapplyService { vo.setFinBillTrailers(finBillTrailerVos); //附件信息 List khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs(); + List carBuyContractImages = finBillApplicationDetailsVo.getCarBuyContractImages(); List kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs(); List zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index b5f050f0ff..d3c5e5bddb 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -973,7 +973,11 @@ public class AppBusSalesOrderService { } for (int i = 0; i < appSalesOrderTrailerDetailsVos.size(); i++) { AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = appSalesOrderTrailerDetailsVos.get(i); - appSalesOrderTrailerDetailsVo.setTrailerName("挂车" + (i + 1)); + if (appSalesOrderTrailerDetailsVos.size() == 1){ + appSalesOrderTrailerDetailsVo.setTrailerName("挂车"); + }else { + appSalesOrderTrailerDetailsVo.setTrailerName("挂车" + (i + 1)); + } } trailerVo.setRecords(appSalesOrderTrailerDetailsVos); trailerVo.setTotal(total); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyVo.java index 053cdfe98e..87ce63f899 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyVo.java @@ -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 fileList = new ArrayList<>(); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyMapper.xml index b9f56530a5..4b04d45127 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyMapper.xml @@ -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 diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java index 48d8579117..753a28db1f 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java @@ -35,6 +35,12 @@ public class BaseGoodsTypeRest { return baseGoodsTypeService.listAll(query); } + @ApiOperation("根据部门sid查询类别") + @PostMapping("/selectByUseOrgSid") + public ResultBean> selectByUseOrgSid(@RequestParam String deptSid) { + return baseGoodsTypeService.selectByUseOrgSid(deptSid); + } + @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") public ResultBean saveOrUpdate(@RequestBody BaseGoodsTypeDto dto) { diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeChoiceVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeChoiceVo.java new file mode 100644 index 0000000000..30984cdadd --- /dev/null +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeChoiceVo.java @@ -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;//类别编码 +} diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java index 3c056e8bec..fa7cdbecc0 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java @@ -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 checkForUpdate(@Param("goodsTypeCode")String goodsTypeCode,@Param("deptSid") String useOrgSid, @Param("sid")String sid); List selListAll(@Param(Constants.WRAPPER) QueryWrapper qw); + + @Select("select * from base_goods_type where useOrgSid = #{deptSid}") + List selectByUseOrgSid(String deptSid); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java index 19aaef96f5..d7fd90f060 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java @@ -304,4 +304,10 @@ public class BaseGoodsTypeService extends MybatisBaseService> selectByUseOrgSid(String deptSid) { + ResultBean rb = ResultBean.fireFail(); + List baseGoodsTypeChoiceVos = baseMapper.selectByUseOrgSid(deptSid); + return rb.success().setData(baseGoodsTypeChoiceVos); + } } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillDetailRest.java b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillDetailRest.java index 73e0270872..3f2d2bfd53 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillDetailRest.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillDetailRest.java @@ -55,14 +55,6 @@ public class SmsPricestrategyBillDetailRest { @Autowired private SmsPricestrategyBillDetailService smsPricestrategyBillDetailService; - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = smsPricestrategyBillDetailService.listPageVo(pq); - return rb.success().setData(pv); - } - @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody SmsPricestrategyBillDetailDto dto){ diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillRest.java b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillRest.java index 7cd106a359..e6a470c35d 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillRest.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillRest.java @@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "价格策略申请") @RestController -@RequestMapping("/apiadmin/sms/smspricestrategybill") +@RequestMapping("v1/smspricestrategybill") public class SmsPricestrategyBillRest { @Autowired diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBill.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBill.java index f2fd231ed8..7fa2b4a605 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBill.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBill.java @@ -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(价格策略)
* File: SmsPricestrategyBill.java
@@ -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; // 组织全路径 } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDetailsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDetailsVo.java index 3b241ecf93..93b76f74d8 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDetailsVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDetailsVo.java @@ -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 smsPricestrategyBillDetailList; } \ No newline at end of file diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDto.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDto.java index 450127196f..af6fe6eb8a 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDto.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDto.java @@ -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 smsPricestrategyBillDetailList; } \ No newline at end of file diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillQuery.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillQuery.java index 1b5cf53384..ee837d574e 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillQuery.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillQuery.java @@ -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; // 组织全路径 - + @ApiModelProperty("组织全路径") + private String orgPath; + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillVo.java index e6bb0615aa..c57d6e8329 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillVo.java @@ -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; } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java index e5191fdb9b..be947719e8 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java @@ -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") diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDto.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDto.java index 4e37a0bd6f..0caca90231 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDto.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDto.java @@ -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") diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.java index de15750032..28083f5218 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.java @@ -52,13 +52,6 @@ import java.util.List; @Mapper public interface SmsPricestrategyBillDetailMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from sms_pricestrategy_bill_detail") - List selectListVo(); - @Delete("delete from sms_pricestrategy_bill_detail where mainSid = #{mainSid}") void delByMainSid(String mainSid); diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml index 0a7479d5c1..f92a84a21b 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml @@ -3,11 +3,4 @@ - - - \ No newline at end of file diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailQuery.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailQuery.java deleted file mode 100644 index 961c95c796..0000000000 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailQuery.java +++ /dev/null @@ -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(价格策略)
- * File: SmsPricestrategyBillDetailQuery.java
- * Class: com.yxt.sms.api.smspricestrategybilldetail.SmsPricestrategyBillDetailQuery
- * Description: 价格策略申请明细 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-28 14:32:24
- * - * @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) - -} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java index 786fbd9da7..d4fdc2eb29 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java @@ -54,15 +54,6 @@ import java.util.List; @Service public class SmsPricestrategyBillDetailService extends MybatisBaseService { - public PagerVo listPageVo(PagerQuery pq) { - SmsPricestrategyBillDetailQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - public void saveOrUpdateDto(SmsPricestrategyBillDetailDto dto){ String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailVo.java deleted file mode 100644 index 3b3de045f9..0000000000 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailVo.java +++ /dev/null @@ -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(价格策略)
- * File: SmsPricestrategyBillDetailVo.java
- * Class: com.yxt.sms.api.smspricestrategybilldetail.SmsPricestrategyBillDetailVo
- * Description: 价格策略申请明细 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-28 14:32:24
- * - * @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) - -} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java index 49c43f565a..55e8d8e472 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java @@ -52,7 +52,7 @@ import java.util.List; */ @Api(tags = "库存盘点") @RestController -@RequestMapping("/apiadmin/inventory/wmsinventorycheckbill") +@RequestMapping("v1/wmsinventorycheckbill") public class WmsInventoryCheckbillRest { @Autowired