From 16df6d38cda76078360efea3aa0878bac921e60f Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sat, 11 May 2024 15:34:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=B4=A2=E8=B5=94=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=94=B3=E8=AF=B7=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java | 2 +- .../api/asbusclaimcheckapply/AsBusclaimCheckApplyDto.java | 2 +- .../AsBusclaimCheckApplyDetailDto.java | 2 +- .../AsBusclaimCheckApplyDetailVo.java | 6 +++--- .../biz/asbusclaimcheckapply/AsBusclaimCheckApplyRest.java | 5 ----- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java index b0d67fcffc..9ef8314b0b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java @@ -19,7 +19,7 @@ public class AsBusclaimCheckApplyDetailsVo { private String sid; private String createBySid; private String createByName; - private String orgPath; +// private String orgPath; private String createTime; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDto.java index 59f8951205..229f621aa9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDto.java @@ -18,7 +18,7 @@ public class AsBusclaimCheckApplyDto { private String sid; private String createBySid; private String createByName; - private String orgPath; +// private String orgPath; private String createTime; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailDto.java index e0a988a6e1..34d107bdcf 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailDto.java @@ -18,7 +18,7 @@ public class AsBusclaimCheckApplyDetailDto { @ApiModelProperty("维修工单号") private String repairBillNo; @ApiModelProperty("车牌号") - private String vehmark; + private String vehMark; @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("开票申请sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailVo.java index 591539707f..1474b707f7 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailVo.java @@ -18,16 +18,16 @@ public class AsBusclaimCheckApplyDetailVo { @ApiModelProperty("维修工单号") private String repairBillNo; @ApiModelProperty("车牌号") - private String vehmark; + private String vehMark; @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("开票申请sid") private String billInvoiceSid; @ApiModelProperty("开票明细sid") private String billInvoiceDetailSid; - @ApiModelProperty("索赔工时费") + @ApiModelProperty("调整工时费") private String claimHourAmount; - @ApiModelProperty("索赔材料费") + @ApiModelProperty("调整材料费") private String claimGoodsAmount; @ApiModelProperty("外出费") private String claimOutAmount; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyRest.java index 888a636c6a..e20df96c36 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyRest.java @@ -6,11 +6,6 @@ import com.yxt.anrui.as.api.asbusclaimcheckapply.AsBusclaimCheckApplyDto; import com.yxt.anrui.as.api.asbusclaimcheckapply.AsBusclaimCheckApplyQuery; import com.yxt.anrui.as.api.asbusclaimcheckapply.AsBusclaimCheckApplyVo; import com.yxt.anrui.as.api.asbusclaimcheckapply.flowable.*; -import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillDetailsVo; -import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillDto; -import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillQuery; -import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo; -import com.yxt.anrui.as.api.asbusclaiminvoicebill.flowable.*; import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; From a99612c1332c7504a887ea458298a77e9ca59a80 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sat, 11 May 2024 15:48:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=B4=A2=E8=B5=94=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=94=B3=E8=AF=B7=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java | 1 + 1 file changed, 1 insertion(+) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java index 27b63126ab..7ec5e912cf 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java @@ -12,6 +12,7 @@ public enum ProcDefEnum { ASOLDPARTHANDLEAPPLY("旧件处理申请", "process_sshks74p:1:10887504"), REVERSESETTLEAPPLY("工单反结算申请", "process_g3r02po8:1:10975004"), ASBUSCLAIMINVOICEBILL("索赔单开票申请", "process_33p7rz6h:1:11297504"), + ASBUSCLAIMCHECKAPPLY("索赔单调整申请", "process_7icw4lhq:1:11310004"), ; From 91204cc86da4b45de992ba69445ca255bf191fa6 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sat, 11 May 2024 15:49:38 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=B4=A2=E8=B5=94=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=94=B3=E8=AF=B7=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java index 7013268e0c..9e7bbb6cbe 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java @@ -252,7 +252,7 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService voResultBean = flowFeign.startProcess(bv); if (!voResultBean.getSuccess()) { return rb.setMsg(voResultBean.getMsg()); From b5aeaa9dd3970bc6b90911f92bb8db4984a68fa5 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 11 May 2024 15:56:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E7=94=B3=E8=AF=B7=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PmsPurchasebackBill.java | 4 +- .../PmsPurchasebackBillDetailsVo.java | 4 +- .../PmsPurchasebackBillDto.java | 4 +- .../PmsPurchasebackBillMapper.xml | 3 +- .../PmsPurchasebackDetail.java | 12 ----- .../PmsPurchasebackDetailDetailsVo.java | 12 ----- .../PmsPurchasebackDetailDto.java | 12 ----- .../PmsPurchasebackDetailMapper.java | 5 -- .../PmsPurchasebackDetailMapper.xml | 4 -- .../PmsPurchasebackDetailQuery.java | 45 ------------------ .../PmsPurchasebackDetailVo.java | 47 ------------------- 11 files changed, 11 insertions(+), 141 deletions(-) diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java index 7b53d96fd8..ec390ca84c 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java @@ -77,8 +77,10 @@ public class PmsPurchasebackBill extends BaseEntity { @ApiModelProperty("单据状态") private String documentState; - @ApiModelProperty("已付金额") + @ApiModelProperty("应付金额") private BigDecimal paidAmount; + @ApiModelProperty("应收金额") + private BigDecimal receivableAmount; @ApiModelProperty("申请部门sid") private String deptSid; diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java index a610a0a513..01c77d3b1c 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java @@ -81,8 +81,10 @@ public class PmsPurchasebackBillDetailsVo implements Vo { @ApiModelProperty("转入预付款") private BigDecimal toPrepayment; // 转入预付款 - @ApiModelProperty("已付金额") + @ApiModelProperty("应付金额") private BigDecimal paidAmount; + @ApiModelProperty("应收金额") + private BigDecimal receivableAmount; @ApiModelProperty("申请部门sid") private String deptSid; diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java index c51163afbd..486bb05477 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java @@ -80,8 +80,10 @@ public class PmsPurchasebackBillDto implements Dto { @ApiModelProperty("转入预付款") private BigDecimal toPrepayment; // 转入预付款 - @ApiModelProperty("已付金额") + @ApiModelProperty("应付金额") private BigDecimal paidAmount; + @ApiModelProperty("应收金额") + private BigDecimal receivableAmount; @ApiModelProperty("申请部门sid") private String deptSid; diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml index f2375b8b3c..4b4b2c71a6 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml @@ -17,7 +17,8 @@ pb.`purchaseReasonValue`, pb.`purchaseTypeValue`, pb.supplierName, - SUM(ppbd.backAmount) AS backAmountCount + SUM(ppbd.backAmount) AS backAmountCount, + ppb.receivableAmount FROM pms_purchaseback_bill ppb LEFT JOIN pms_purchase_bill pb diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java index 48ac61fc04..b757e2995c 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java @@ -56,8 +56,6 @@ public class PmsPurchasebackDetail extends BaseEntity { private String createByName; // 制单人姓名 @ApiModelProperty("单据sid") private String billSid; // 单据sid - @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid @ApiModelProperty("商品基础信息Sid") private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") @@ -70,22 +68,12 @@ public class PmsPurchasebackDetail extends BaseEntity { private String goodsSkuCode; // 商品编码（图号） @ApiModelProperty("规格") private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("退货前的库存数量") - private BigDecimal currentCount; // 退货前的库存数量 @ApiModelProperty("计量单位") private String unit; // 计量单位 @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid @ApiModelProperty("仓库名称") private String warehouseName; // 仓库名称 - @ApiModelProperty("库区/货位sid") - private String areaSid; // 库区/货位sid - @ApiModelProperty("库区名称") - private String warehouseAreaName; // 库区名称 - @ApiModelProperty("货架sid") - private String rackSid; // 货架sid - @ApiModelProperty("货架名称") - private String warehouseRackName; // 货架名称 @ApiModelProperty("已退数量") private BigDecimal returnedCount; // 已退数量 @ApiModelProperty("退货数量") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java index 12b3a34616..680c18a0eb 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java @@ -57,8 +57,6 @@ public class PmsPurchasebackDetailDetailsVo implements Vo { private String createByName; // 制单人姓名 @ApiModelProperty("单据sid") private String billSid; // 单据sid - @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid @ApiModelProperty("商品基础信息Sid") private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") @@ -71,22 +69,12 @@ public class PmsPurchasebackDetailDetailsVo implements Vo { private String goodsSkuCode; // 商品编码（图号） @ApiModelProperty("规格") private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("退货前的库存数量") - private BigDecimal currentCount; // 退货前的库存数量 @ApiModelProperty("计量单位") private String unit; // 计量单位 @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid @ApiModelProperty("仓库名称") private String warehouseName; // 仓库名称 - @ApiModelProperty("库区/货位sid") - private String areaSid; // 库区/货位sid - @ApiModelProperty("库区名称") - private String warehouseAreaName; // 库区名称 - @ApiModelProperty("货架sid") - private String rackSid; // 货架sid - @ApiModelProperty("货架名称") - private String warehouseRackName; // 货架名称 @ApiModelProperty("已退数量") private BigDecimal returnedCount; // 已退数量 @ApiModelProperty("退货数量") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java index 1a3dfce4f2..0ac12eeedc 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java @@ -57,8 +57,6 @@ public class PmsPurchasebackDetailDto implements Dto { private String createByName; // 制单人姓名 @ApiModelProperty("单据sid") private String billSid; // 单据sid - @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid @ApiModelProperty("商品基础信息Sid") private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") @@ -71,22 +69,12 @@ public class PmsPurchasebackDetailDto implements Dto { private String goodsSkuCode; // 商品编码（图号） @ApiModelProperty("规格") private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("退货前的库存数量") - private BigDecimal currentCount; // 退货前的库存数量 @ApiModelProperty("计量单位") private String unit; // 计量单位 @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid @ApiModelProperty("仓库名称") private String warehouseName; // 仓库名称 - @ApiModelProperty("库区/货位sid") - private String areaSid; // 库区/货位sid - @ApiModelProperty("库区名称") - private String warehouseAreaName; // 库区名称 - @ApiModelProperty("货架sid") - private String rackSid; // 货架sid - @ApiModelProperty("货架名称") - private String warehouseRackName; // 货架名称 @ApiModelProperty("已退数量") private BigDecimal returnedCount; // 已退数量 @ApiModelProperty("退货数量") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java index 7d248f9411..fad5f2bec5 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java @@ -54,11 +54,6 @@ public interface PmsPurchasebackDetailMapper extends BaseMapper selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from pms_purchaseback_detail") - List selectListVo(); - @Delete("delete from pms_purchaseback_detail where billSid = #{dtoSid}") void delByMainSid(String dtoSid); diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml index 6c6a1a31b2..c53939af7f 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml @@ -6,8 +6,4 @@ - - \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailQuery.java index 3eb8a39182..027b5e6e5b 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailQuery.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailQuery.java @@ -51,49 +51,4 @@ import java.math.BigDecimal; @ApiModel(value = "采购退货单据明细 查询条件", description = "采购退货单据明细 查询条件") public class PmsPurchasebackDetailQuery implements Query { - @ApiModelProperty("制单人姓名") - private String createByName; // 制单人姓名 - @ApiModelProperty("单据sid") - private String billSid; // 单据sid - @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid - @ApiModelProperty("商品基础信息Sid") - private String goodsSpuSid; // 商品基础信息Sid - @ApiModelProperty("商品名称") - private String goodsSpuName; // 商品名称 - @ApiModelProperty("商品Skusid") - private String goodsSkuSid; // 商品Skusid - @ApiModelProperty("商品Sku名称") - private String goodsSkuTitle; // 商品Sku名称 - @ApiModelProperty("商品编码（图号）") - private String goodsSkuCode; // 商品编码（图号） - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("退货前的库存数量") - private BigDecimal currentCount; // 退货前的库存数量 - @ApiModelProperty("计量单位") - private String unit; // 计量单位 - @ApiModelProperty("仓库sid") - private String warehouseSid; // 仓库sid - @ApiModelProperty("仓库名称") - private String warehouseName; // 仓库名称 - @ApiModelProperty("库区/货位sid") - private String areaSid; // 库区/货位sid - @ApiModelProperty("库区名称") - private String warehouseAreaName; // 库区名称 - @ApiModelProperty("货架sid") - private String rackSid; // 货架sid - @ApiModelProperty("货架名称") - private String warehouseRackName; // 货架名称 - @ApiModelProperty("已退数量") - private BigDecimal returnedCount; // 已退数量 - @ApiModelProperty("退货数量") - private BigDecimal backCount; // 退货数量 - @ApiModelProperty("税额") - private BigDecimal maxAmount; // 税额 - @ApiModelProperty("含税价") - private BigDecimal maxPrice; // 含税价 - @ApiModelProperty("退货金额") - private BigDecimal backAmount; // 退货金额 - } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailVo.java index 87a8cb89f6..2c1ecf4750 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailVo.java @@ -51,51 +51,4 @@ import java.math.BigDecimal; @ApiModel(value = "采购退货单据明细 视图数据对象", description = "采购退货单据明细 视图数据对象") public class PmsPurchasebackDetailVo implements Vo { - private String sid; // sid - - @ApiModelProperty("制单人姓名") - private String createByName; // 制单人姓名 - @ApiModelProperty("单据sid") - private String billSid; // 单据sid - @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid - @ApiModelProperty("商品基础信息Sid") - private String goodsSpuSid; // 商品基础信息Sid - @ApiModelProperty("商品名称") - private String goodsSpuName; // 商品名称 - @ApiModelProperty("商品Skusid") - private String goodsSkuSid; // 商品Skusid - @ApiModelProperty("商品Sku名称") - private String goodsSkuTitle; // 商品Sku名称 - @ApiModelProperty("商品编码（图号）") - private String goodsSkuCode; // 商品编码（图号） - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("退货前的库存数量") - private BigDecimal currentCount; // 退货前的库存数量 - @ApiModelProperty("计量单位") - private String unit; // 计量单位 - @ApiModelProperty("仓库sid") - private String warehouseSid; // 仓库sid - @ApiModelProperty("仓库名称") - private String warehouseName; // 仓库名称 - @ApiModelProperty("库区/货位sid") - private String areaSid; // 库区/货位sid - @ApiModelProperty("库区名称") - private String warehouseAreaName; // 库区名称 - @ApiModelProperty("货架sid") - private String rackSid; // 货架sid - @ApiModelProperty("货架名称") - private String warehouseRackName; // 货架名称 - @ApiModelProperty("已退数量") - private BigDecimal returnedCount; // 已退数量 - @ApiModelProperty("退货数量") - private BigDecimal backCount; // 退货数量 - @ApiModelProperty("税额") - private BigDecimal maxAmount; // 税额 - @ApiModelProperty("含税价") - private BigDecimal maxPrice; // 含税价 - @ApiModelProperty("退货金额") - private BigDecimal backAmount; // 退货金额 - } From 76379bc95397a1b0d8ac66c4f3fae8d79bc212c4 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 11 May 2024 16:09:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E7=8A=B6=E6=80=81=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=92=8C=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java | 2 ++ .../api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java | 2 ++ .../biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml | 1 + .../biz/basevehicleoutapply/BaseVehicleOutApplyService.java | 4 ++++ 4 files changed, 9 insertions(+) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java index 1eccc6362c..7af5bf6f9f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java @@ -48,6 +48,8 @@ import lombok.Data; @ApiModel(value = "车辆出库单 查询条件", description = "车辆出库单 查询条件") public class BaseVehicleOutApplyQueryNew implements Query { + @ApiModelProperty("业务状态") + private String isDelete; @ApiModelProperty("物料编码") private String materialCode; @ApiModelProperty("车架号") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java index 245b7b2f3e..aabbffdd47 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java @@ -50,6 +50,8 @@ public class BaseVehicleOutApplyVoNew implements Vo { @ApiModelProperty("sid") private String sid; + @ApiModelProperty("业务状态") + private String isDelete; @ApiModelProperty("车辆sid") private String vinSid; @ApiModelProperty("车架号") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml index 98313417ec..4e997d0b97 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml @@ -6,6 +6,7 @@