From b2b1eed8a93bdcd19088a96294b2b1001832d856 Mon Sep 17 00:00:00 2001 From: 86156 <823267011@qq.com> Date: Fri, 20 Mar 2026 14:43:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E6=9B=B4=E6=96=B0=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=96=B0=E5=A2=9E=E8=BD=AF=E6=8E=A8=E8=8D=90=EF=BC=8C?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BD=95=E5=85=A5=E5=92=8C=E5=AE=9E=E7=BB=A9?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=B7=BB=E5=8A=A0=E5=85=A5=E5=9C=BA=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E5=8F=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/klp/pocket/galvanize1/domain/CrmPdiPlan.java | 1 + .../java/com/klp/pocket/galvanize1/domain/CrmPdoExcoil.java | 1 + .../java/com/klp/pocket/galvanize1/domain/bo/CrmPdiPlanBo.java | 1 + .../com/klp/pocket/galvanize1/domain/bo/CrmPdoExcoilBo.java | 1 + .../java/com/klp/pocket/galvanize1/domain/vo/CrmPdiPlanVo.java | 1 + .../com/klp/pocket/galvanize1/domain/vo/CrmPdoExcoilVo.java | 1 + .../pocket/galvanize1/service/impl/CrmPdiPlanServiceImpl.java | 3 +-- 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/CrmPdiPlan.java b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/CrmPdiPlan.java index e01583a1..9e4d3679 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/CrmPdiPlan.java +++ b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/CrmPdiPlan.java @@ -18,6 +18,7 @@ public class CrmPdiPlan { private Integer seqid; private String coilid; + private String enterCoilNo; private Integer dummyCoilFlag; private String status; private String planid; diff --git a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/CrmPdoExcoil.java b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/CrmPdoExcoil.java index b81ed0ca..c43914a4 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/CrmPdoExcoil.java +++ b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/CrmPdoExcoil.java @@ -19,6 +19,7 @@ public class CrmPdoExcoil { private String exitMatId; private String entryMatId; + private String enterCoilNo; private Integer subId; private Double startPosition; private Double endPosition; diff --git a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/bo/CrmPdiPlanBo.java b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/bo/CrmPdiPlanBo.java index de6213b6..13e412c4 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/bo/CrmPdiPlanBo.java +++ b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/bo/CrmPdiPlanBo.java @@ -15,6 +15,7 @@ public class CrmPdiPlanBo extends BaseEntity { private Integer seqid; private String coilid; + private String enterCoilNo; private Integer dummyCoilFlag; private String status; private String planid; diff --git a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/bo/CrmPdoExcoilBo.java b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/bo/CrmPdoExcoilBo.java index d6727b4b..f9cf2e26 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/bo/CrmPdoExcoilBo.java +++ b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/bo/CrmPdoExcoilBo.java @@ -15,6 +15,7 @@ public class CrmPdoExcoilBo extends BaseEntity { private String exitMatId; private String entryMatId; + private String enterCoilNo; private Integer subId; private Double startPosition; private Double endPosition; diff --git a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/vo/CrmPdiPlanVo.java b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/vo/CrmPdiPlanVo.java index 483e4add..12f17cde 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/vo/CrmPdiPlanVo.java +++ b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/vo/CrmPdiPlanVo.java @@ -12,6 +12,7 @@ public class CrmPdiPlanVo { private Integer seqid; private String coilid; + private String enterCoilNo; private Integer dummyCoilFlag; private String status; private String planid; diff --git a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/vo/CrmPdoExcoilVo.java b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/vo/CrmPdoExcoilVo.java index a43d99ec..95eab28e 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/vo/CrmPdoExcoilVo.java +++ b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/domain/vo/CrmPdoExcoilVo.java @@ -12,6 +12,7 @@ public class CrmPdoExcoilVo { private String exitMatId; private String entryMatId; + private String enterCoilNo; private Integer subId; private Double startPosition; private Double endPosition; diff --git a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/service/impl/CrmPdiPlanServiceImpl.java b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/service/impl/CrmPdiPlanServiceImpl.java index 8bdba133..dc3e1f63 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/galvanize1/service/impl/CrmPdiPlanServiceImpl.java +++ b/klp-pocket/src/main/java/com/klp/pocket/galvanize1/service/impl/CrmPdiPlanServiceImpl.java @@ -18,7 +18,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; import java.util.List; -import java.util.Map; @RequiredArgsConstructor @DS("galvanize1") @@ -46,11 +45,11 @@ public class CrmPdiPlanServiceImpl implements ICrmPdiPlanService { } private LambdaQueryWrapper buildQueryWrapper(CrmPdiPlanBo bo) { - Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getId() != null, CrmPdiPlan::getId, bo.getId()); lqw.eq(bo.getSeqid() != null, CrmPdiPlan::getSeqid, bo.getSeqid()); lqw.eq(StringUtils.isNotBlank(bo.getCoilid()), CrmPdiPlan::getCoilid, bo.getCoilid()); + lqw.eq(StringUtils.isNotBlank(bo.getEnterCoilNo()), CrmPdiPlan::getEnterCoilNo, bo.getEnterCoilNo()); lqw.eq(StringUtils.isNotBlank(bo.getStatus()), CrmPdiPlan::getStatus, bo.getStatus()); lqw.eq(StringUtils.isNotBlank(bo.getPlanid()), CrmPdiPlan::getPlanid, bo.getPlanid()); lqw.eq(StringUtils.isNotBlank(bo.getPlanType()), CrmPdiPlan::getPlanType, bo.getPlanType());