From f594405911759b83904feb94a9f62e144fa01245 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 6 Aug 2024 11:20:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E5=8D=95=E4=BD=8D=E4=B8=8B?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=AE=8C=E6=88=90=20=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=95=86=E5=93=81=E8=BF=94=E5=9B=9E=E6=9C=89=E6=95=88=E6=9C=9F?= =?UTF-8?q?=E5=92=8C=E7=A8=8E=E7=8E=87=EF=BC=8C=E4=BF=9D=E5=AD=98=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E5=8D=95=E4=BF=9D=E5=AD=98=E6=9C=89=E6=95=88=E6=9C=9F?= =?UTF-8?q?=E5=88=B0=E9=87=87=E8=B4=AD=E5=95=86=E5=93=81=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/biz/purchasebilldetail/PurchaseBillDetail.java | 3 +++ .../biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java | 2 ++ .../purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java | 2 ++ 3 files changed, 7 insertions(+) diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java index 6666ec0..8bc0cec 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java @@ -97,4 +97,7 @@ public class PurchaseBillDetail extends BaseEntity { private BigDecimal unTaxPrice; @ApiModelProperty("未含税总价（未含税价*采购数量）") private BigDecimal unTaxTotalAmount; + + @ApiModelProperty("保质期") + private Integer shelfLife; } diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java index 341a89c..0694268 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java @@ -99,6 +99,8 @@ public class PurchaseBillDetailDetailsVo implements Vo { private Date deliveryDate; @ApiModelProperty("总税额") private BigDecimal taxAmount; + @ApiModelProperty("保质期") + private Integer shelfLife; /* * 商品扩展字段 diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java index 8916ee6..8595b04 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java @@ -95,6 +95,8 @@ public class PurchaseBillDetailDto implements Dto { private String deliveryDate; @ApiModelProperty("总税额") private BigDecimal taxAmount; + @ApiModelProperty("保质期") + private Integer shelfLife; /* * 商品扩展字段 From 7096ab3053fea8c6b4a1187b4b7cf0be1b69b104 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 6 Aug 2024 11:33:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=AE=A1=E6=A0=B8=E5=A2=9E=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81=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 --- .../com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java | 3 +++ .../com/yxt/purchase/biz/purchasebill/PurchaseBillService.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java index 6fedc16..189caba 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java @@ -65,4 +65,7 @@ public class PurchaseBillQuery implements Query { @ApiModelProperty("用户sid") private String userSid; private int index; + + @ApiModelProperty("审核状态key") + private String examineStateKey; } diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java index 318ec10..45ed4f9 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java @@ -199,6 +199,9 @@ public class PurchaseBillService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). From ad87b352088eaa0c379b293f1900785d7d74a67b Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 6 Aug 2024 17:23:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=AC=E5=9C=B0=E4=BB=98=E6=AC=BE=E3=80=81?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=8A=B6=E6=80=81=E3=80=81=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java | 5 +++++ .../yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java index 00ebb67..213798a 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java @@ -68,4 +68,9 @@ public class PurchaseBillExVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("最后修改时间") private Date modifyTime; + + @ApiModelProperty("收货状态value") + private String receiveStateValue; + @ApiModelProperty("发货状态value") + private String deliveryStateValue; } diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml index 8d6258b..0877d22 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml @@ -56,12 +56,14 @@ when 2 then '已审核' when 3 then '审核未通过' end as state, SUM(pbd.amount) AS amountTotal, - pba.thisPayAmount, SUM(pbd.taxAmount) AS taxAmount, SUM(pbd.count) AS countTotal, pb.`remarks`, pb.`createByName`, - pb.`modifyTime` + pb.`modifyTime`, + pba.prepayment AS thisPayAmount, + pbe.receiveStateValue, + pbe.deliveryStateValue FROM purchase_bill pb LEFT JOIN purchase_bill_detail pbd From 8dd7ea772ecae4a250750115657efa05ce9884f7 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 7 Aug 2024 10:26:23 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/purchasebill/PurchaseBillService.java | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java index 45ed4f9..d55996f 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java @@ -72,8 +72,6 @@ public class PurchaseBillService extends MybatisBaseService> listPageVo(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -247,9 +245,6 @@ public class PurchaseBillService extends MybatisBaseService purchaseAppendixUrlList = new ArrayList<>(); for (PurchaseAppendixDetailsVo purchaseAppendixDetailsVo : purchaseAppendixDetailsVos) { PurchaseAppendixUrl purchaseAppendixUrl = new PurchaseAppendixUrl(); - String url = fileUploadComponent.getUrlPrefix() + purchaseAppendixDetailsVo.getFilePath(); - purchaseAppendixUrl.setUrl(url); + purchaseAppendixUrl.setUrl(purchaseAppendixDetailsVo.getFilePath()); purchaseAppendixUrlList.add(purchaseAppendixUrl); } vo.setPurchaseAppendixList(purchaseAppendixUrlList); From a3f8e1647a6ed90ed051b8950257f38ac7769007 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 21 Aug 2024 16:25:20 +0800 Subject: [PATCH 5/5] 1 --- .../com/yxt/purchase/biz/purchasebill/PurchaseBillService.java | 1 + .../biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java index d55996f..631355d 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java @@ -353,6 +353,7 @@ public class PurchaseBillService extends MybatisBaseService