From bc203916cf5e524a2312961ffd995234f83f0bb3 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Fri, 28 Jun 2024 08:37:05 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9A=84=E9=87=87=E8=B4=AD=E6=8A=A5=E4=BB=B7=EF=BC=9A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=EF=BC=8C=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E7=89=A9=E6=96=99=E6=96=99=E5=8F=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=B7=B2=E9=80=9A=E8=BF=87=E7=89=A9=E6=96=99=E6=96=99=E5=8F=B7?= =?UTF-8?q?=E7=9B=B8=E5=90=8C=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E4=BB=B7=E5=88=97=E8=A1=A8=E7=9A=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/domain/PurchaseQuoteChild.java | 24 ++++++++++++------- .../mapper/PurchaseQuoteChildMapper.java | 2 ++ .../service/IPurchaseQuoteChildService.java | 1 + .../impl/PurchaseQuoteChildServiceImpl.java | 5 ++++ .../purchase/PurchaseQuoteChildMapper.xml | 7 ++++++ 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseQuoteChild.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseQuoteChild.java index 66fc9dcd..5dc557a4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseQuoteChild.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseQuoteChild.java @@ -22,7 +22,6 @@ public class PurchaseQuoteChild extends BaseEntity /** 关联报价编号字段 */ @Excel(name = "关联报价编号字段") private String purchaseQuoteCode; - /** 物料表中的id */ @Excel(name = "物料表中的id") private Long materialId; @@ -288,7 +287,22 @@ public class PurchaseQuoteChild extends BaseEntity { return delFlag; } + private String purchasePlanCode; + public void setPurchasePlanCode(String purchasePlanCode) { + this.purchasePlanCode = purchasePlanCode; + } + public String getPurchasePlanCode() { + return purchasePlanCode; + } + private String correlationCode; + + public void setCorrelationCode(String correlationCode) { + this.correlationCode = correlationCode; + } + public String getCorrelationCode() { + return correlationCode; + } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -320,11 +334,5 @@ public class PurchaseQuoteChild extends BaseEntity .append("delFlag", getDelFlag()) .toString(); } - private String purchasePlanCode; - public String setPurchasePlanCode(String purchasePlanCode) { - return this.purchasePlanCode = purchasePlanCode; - } - public String getPurchasePlanCode() { - return purchasePlanCode; - } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/mapper/PurchaseQuoteChildMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/mapper/PurchaseQuoteChildMapper.java index edfb285b..1749dce5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/mapper/PurchaseQuoteChildMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/mapper/PurchaseQuoteChildMapper.java @@ -78,4 +78,6 @@ public interface PurchaseQuoteChildMapper * @return 结果 */ public int restorePurchaseQuoteChildById(Long purchaseQuoteChildId); + + List selectQuoteChildByMaterialCode(String materialCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseQuoteChildService.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseQuoteChildService.java index e3ee35ea..f32b96a4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseQuoteChildService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseQuoteChildService.java @@ -81,4 +81,5 @@ public interface IPurchaseQuoteChildService */ int restorePurchaseQuoteChildById(Long purchaseQuoteChildId); + List selectQuoteChildByMaterialCode(String materialCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseQuoteChildServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseQuoteChildServiceImpl.java index a51b0486..1f4b544d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseQuoteChildServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseQuoteChildServiceImpl.java @@ -128,4 +128,9 @@ public class PurchaseQuoteChildServiceImpl implements IPurchaseQuoteChildService { return purchaseQuoteChildMapper.restorePurchaseQuoteChildById(purchaseQuoteChildId); } + + @Override + public List selectQuoteChildByMaterialCode(String materialCode) { + return purchaseQuoteChildMapper.selectQuoteChildByMaterialCode(materialCode); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteChildMapper.xml index 2cf6bac8..d801657a 100644 --- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteChildMapper.xml @@ -182,5 +182,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update purchase_quote_child set del_flag = '0' where purchase_quote_child_id = #{purchaseQuoteChildId} + \ No newline at end of file