From 2bed2b36eb92fa66e25db2244d78b050f3e93386 Mon Sep 17 00:00:00 2001 From: zelian_wu <15576055375@163.com> Date: Thu, 28 Dec 2023 09:14:58 +0800 Subject: [PATCH] =?UTF-8?q?2023-12-26=20=E8=AF=A2=E4=BB=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E6=8A=A5=E4=BB=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/proofing/entity/ProofingInformationEntity.java | 2 +- .../java/com/spring/modules/quotation/entity/SeqRule.java | 6 +++--- .../quotation/service/impl/QuotationHeaderServerImpl.java | 6 +++++- .../spring/modules/test/entity/TestInformationEntity.java | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java b/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java index 63621535..9d66e96e 100644 --- a/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java +++ b/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java @@ -61,7 +61,7 @@ public class ProofingInformationEntity extends QueryPage implements Serializable **/ @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date required_delivery_date; + private Date requiredDeliveryDate; /** * 备注 **/ diff --git a/src/main/java/com/spring/modules/quotation/entity/SeqRule.java b/src/main/java/com/spring/modules/quotation/entity/SeqRule.java index 2c18552e..385830b9 100644 --- a/src/main/java/com/spring/modules/quotation/entity/SeqRule.java +++ b/src/main/java/com/spring/modules/quotation/entity/SeqRule.java @@ -1,8 +1,6 @@ package com.spring.modules.quotation.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -18,8 +16,10 @@ public class SeqRule { private String prefix; private Integer length; private Long currentVal; + @TableField(fill = FieldFill.INSERT,updateStrategy = FieldStrategy.NEVER) private Date createDate; private String createBy; + @TableField(fill = FieldFill.UPDATE,insertStrategy = FieldStrategy.NEVER) private Date updateDate; private String updateBy; private String site; diff --git a/src/main/java/com/spring/modules/quotation/service/impl/QuotationHeaderServerImpl.java b/src/main/java/com/spring/modules/quotation/service/impl/QuotationHeaderServerImpl.java index 9a42fe4e..3131bc52 100644 --- a/src/main/java/com/spring/modules/quotation/service/impl/QuotationHeaderServerImpl.java +++ b/src/main/java/com/spring/modules/quotation/service/impl/QuotationHeaderServerImpl.java @@ -70,7 +70,11 @@ public class QuotationHeaderServerImpl extends ServiceImpl list = quotationInformationService.searchQuotationByQuotationNo(quotationHeader.getSite(), quotationHeader.getInternalInquiryNo()); + if (null == list){ + throw new RuntimeException("该询价单号不存在"); + } + QuotationInformationVo informationVo = list.get(0); quotationHeader.setInternalInquiryNo(informationVo.getQuotationBatchNo().toUpperCase());; boolean saveFlag = save(quotationHeader); QuotationDetail detail = new QuotationDetail(); diff --git a/src/main/java/com/spring/modules/test/entity/TestInformationEntity.java b/src/main/java/com/spring/modules/test/entity/TestInformationEntity.java index dde1cacf..d96a6514 100644 --- a/src/main/java/com/spring/modules/test/entity/TestInformationEntity.java +++ b/src/main/java/com/spring/modules/test/entity/TestInformationEntity.java @@ -60,7 +60,7 @@ public class TestInformationEntity extends QueryPage implements Serializable { **/ @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date required_delivery_date; + private Date requiredDeliveryDate; /** * 备注 **/