From 6ab85e96cec75a15fe66d7a094d0f9c828f857b0 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 14 May 2024 15:00:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsServiceSubjectService.java | 1 + .../PmsPurchasebackBillService.java | 8 +++---- .../PmsPurchasebackDetailMapper.java | 3 +++ .../PmsPurchasebackDetailMapper.xml | 12 ++++++++++ .../PmsPurchasebackDetailService.java | 22 +++++-------------- .../PmsPurchaseBillService.java | 7 ++++++ .../PmsPurchaseBillDetailDetailsVo.java | 3 +++ .../pms/feign/flowable/flow/ProcDefEnum.java | 2 +- 8 files changed, 37 insertions(+), 21 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java index 8f93ad98a0..6ab537cded 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java @@ -88,6 +88,7 @@ public class AsServiceSubjectService extends MybatisBaseService saveOrUpdateDto(PmsPurchasebackBillDto dto){ ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); - int i = baseMapper.checkNodeStateBySourceBillSid(dto.getSourceBillSid()); - if (i > 0){ - return rb.setMsg(dto.getSourceBillNo() + "存在待提交或审批中的申请"); - } List pmsPurchasebackDetailList = dto.getPmsPurchasebackDetailList(); String deptSid = dto.getDeptSid(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); @@ -170,6 +166,10 @@ public class PmsPurchasebackBillService extends MybatisBaseService 0){ + return rb.setMsg(dto.getSourceBillNo() + "存在待提交或审批中的申请"); + } //生成单据编号 String billNo = ""; String date = DateUtil.format(DateUtil.date(), "yyyyMM"); 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 fad5f2bec5..f27f222707 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 @@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.math.BigDecimal; import java.util.List; /** @@ -59,4 +60,6 @@ public interface PmsPurchasebackDetailMapper extends BaseMapper selByMainSid(String billSid); + + BigDecimal checkReturnedCount(@Param("goodsSkuSid") String goodsSkuSid,@Param("sourceBillSid") String sourceBillSid); } \ No newline at end of file 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 c53939af7f..49007bbeaa 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,4 +6,16 @@ + + \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailService.java index 3b69d1d5b7..057c8ef214 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailService.java @@ -36,6 +36,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -64,12 +65,7 @@ public class PmsPurchasebackDetailService extends MybatisBaseService selByMainSid(String billSid) { return baseMapper.selByMainSid(billSid); } + + public BigDecimal checkReturnedCount(String goodsSkuSid,String sourceBillSid) { + return baseMapper.checkReturnedCount(goodsSkuSid,sourceBillSid); + } } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java index e35b601041..0efdba588c 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java @@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.core.result.ResultBean; import com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillService; +import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService; import com.yxt.pms.biz.pms.pmspurchasebill.flowable.*; import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDetailsVo; import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDto; @@ -91,6 +92,8 @@ public class PmsPurchaseBillService extends MybatisBaseService pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(record.getSid()); + for (PmsPurchaseBillDetailDetailsVo pmsPurchaseBillDetailDetailsVo : pmsPurchaseBillDetailDetailsVos) { + BigDecimal returnedCount = pmsPurchasebackDetailService.checkReturnedCount(pmsPurchaseBillDetailDetailsVo.getGoodsSkuSid(),record.getSid()); + pmsPurchaseBillDetailDetailsVo.setReturnedCount(returnedCount); + } record.setPmsPurchaseBillDetailList(pmsPurchaseBillDetailDetailsVos); } PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java index 3b6e9c6f3b..6c1f852428 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java @@ -85,4 +85,7 @@ public class PmsPurchaseBillDetailDetailsVo implements Vo { private BigDecimal taxPrice; // 含税价 @ApiModelProperty("采购金额") private BigDecimal amount; // 采购金额 + + @ApiModelProperty("已退数量") + private BigDecimal returnedCount; } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/flowable/flow/ProcDefEnum.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/flowable/flow/ProcDefEnum.java index a83aa586e9..e79d2ccdd9 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/flowable/flow/ProcDefEnum.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/flowable/flow/ProcDefEnum.java @@ -8,7 +8,7 @@ public enum ProcDefEnum { /***************************正式流程id***********************************/ PMSPURCHASEBILL("采购单申请", "process_cx2htjth:1:11280004"), - PMSPURCHASEBACKBILL("采购退货单申请", "process_cx2htjth:1:11280004"), + PMSPURCHASEBACKBILL("采购退货单申请", "process_00x6bf4z:1:11305004"), ; From 6d11c5d5d24cf73b3e51d748b6a08e5b1e475557 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 14 May 2024 15:35:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java | 4 +++- .../as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java | 2 ++ .../anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java | 2 ++ .../yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java | 2 +- .../com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java | 6 ++++++ .../com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java | 2 ++ .../asbusrepairbillinsurance/AsBusrepairBillInsurance.java | 6 ++++++ .../as/biz/asservicepackage/AsServicePackageMapper.xml | 2 +- 8 files changed, 23 insertions(+), 3 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java index 2b58b5e7fc..cf55056c81 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java @@ -20,7 +20,9 @@ public class AsBusrepairBill extends BaseEntity { @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") - private Integer billType; + private Integer billTypeKey; + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billType; @ApiModelProperty("进厂时间") private Date entryTime; @ApiModelProperty("预计完工时间-工单") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java index bdd8c1d8b6..55e75ac331 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java @@ -38,6 +38,8 @@ public class AsBusrepairBillDetailsVo implements Vo { @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billTypeKey; + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") private String billType; @ApiModelProperty("进厂时间") private String entryTime; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java index 279a9db5aa..a14157c00e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java @@ -41,6 +41,8 @@ public class AsBusrepairBillDto implements Dto { @ApiModelProperty("创建组织sid") private String createOrgSid; @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billTypeKey; + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") private String billType; @ApiModelProperty("进厂时间") private String entryTime; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java index fa75995f34..a3401ec07d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java @@ -16,7 +16,7 @@ import java.util.Date; @Data public class AsBusrepairBillVo implements Vo { - + private String sid; @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("当前环节") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java index a020ef6993..2708c86b55 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java @@ -15,6 +15,10 @@ public class InsuranceVo { private String responsibility; @ApiModelProperty("对方险种") private String otherInsuranceType; + @ApiModelProperty("责任划分") + private String responsibilityKey; + @ApiModelProperty("对方险种") + private String otherInsuranceTypeKey; @ApiModelProperty("保险公司1") private String insuranceCompany1; @ApiModelProperty("保险公司2") @@ -31,4 +35,6 @@ public class InsuranceVo { private String isSpecialSign; @ApiModelProperty("出险类型") private String accidentType; + @ApiModelProperty("出险类型") + private String accidentTypeKey; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java index a1e7100781..3d5a281b9d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java @@ -17,6 +17,8 @@ public class InvoiceVo { private String isInvoicing; @ApiModelProperty("发票类型") private String invoiceType; + @ApiModelProperty("发票类型") + private String invoiceTypeKey; @ApiModelProperty("开票名称") private String invoiceTitle; @ApiModelProperty("税号") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurance/AsBusrepairBillInsurance.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurance/AsBusrepairBillInsurance.java index 6727d3f301..acd02c1ae8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurance/AsBusrepairBillInsurance.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurance/AsBusrepairBillInsurance.java @@ -23,6 +23,10 @@ public class AsBusrepairBillInsurance extends BaseEntity { private String responsibility; @ApiModelProperty("对方险种") private String otherInsuranceType; + @ApiModelProperty("责任划分") + private String responsibilityKey; + @ApiModelProperty("对方险种") + private String otherInsuranceTypeKey; @ApiModelProperty("保险公司1") private String insuranceCompany1; @ApiModelProperty("保险公司2") @@ -39,4 +43,6 @@ public class AsBusrepairBillInsurance extends BaseEntity { private Integer isSpecialSign; @ApiModelProperty("出险类型") private String accidentType; + @ApiModelProperty("出险类型") + private String accidentTypeKey; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml index 2ec3e239cd..e1ae0e38be 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml @@ -40,4 +40,4 @@ WHERE useOrgSid = #{useOrgSid} - \ No newline at end of file +