From 5111eda1ec330e73fcf5d7d19e61d56c9580a4b3 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Wed, 4 Dec 2024 16:32:10 +0800 Subject: [PATCH] =?UTF-8?q?2024.12.04=20=E7=89=A9=E6=96=99=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E5=AF=BC=E5=85=A5=E3=80=81=E8=AF=A2=E4=BB=B7=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=96=87=E6=A1=A3=E3=80=81=E9=82=AE=E4=BB=B6=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=93=BE=E6=8E=A5=E4=BC=98=E5=8C=96=EF=BC=8C=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=94=B6=E9=9B=86=E6=89=80=E6=9C=89=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=85=A8=E5=B7=A5=E5=BA=8FSOP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/service/impl/AuthHistServiceImpl.java | 2 +- .../oss/service/impl/SysOssServiceImpl.java | 1 + .../service/impl/PartCostHistServiceImpl.java | 12 ++++++++++-- .../resources/mapper/pms/EamProjectMapper.xml | 17 +++++++++-------- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java index 489aaa34..5071b5fa 100644 --- a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java @@ -107,7 +107,7 @@ public class AuthHistServiceImpl extends ServiceImpl有新的报价单待审批，请及时处理！报价单号:").append(Link).append(""); } else if (emailAddress.get(0).getRecordTypeDb().equals("2")) { - Link = "" + + Link = "" + emailAddress.get(0).getOrderRef1() + ""; fromName = "询价申请单"; s.append("
  • 有新的询价申请单待审批，请及时处理！询价申请单号:").append(Link).append("
    • "); diff --git a/src/main/java/com/xujie/sys/modules/oss/service/impl/SysOssServiceImpl.java b/src/main/java/com/xujie/sys/modules/oss/service/impl/SysOssServiceImpl.java index ee949b25..36b95d94 100644 --- a/src/main/java/com/xujie/sys/modules/oss/service/impl/SysOssServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/oss/service/impl/SysOssServiceImpl.java @@ -136,6 +136,7 @@ public class SysOssServiceImpl extends ServiceImpl impl return lambdaQuery() .eq(SysOssEntity::getOrderRef1, oss.getOrderRef1()) .eq(SysOssEntity::getOrderRef2, oss.getOrderRef2()) + .isNull(SysOssEntity::getOrderRef3) .list(); } diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/PartCostHistServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/PartCostHistServiceImpl.java index 7d45e663..0c3d37f6 100644 --- a/src/main/java/com/xujie/sys/modules/part/service/impl/PartCostHistServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/part/service/impl/PartCostHistServiceImpl.java @@ -74,7 +74,11 @@ public class PartCostHistServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site", task.getSite()).eq("part_no", task.getPartNo()); + queryWrapper.eq("part_no", task.getPartNo()); PartInformationEntity partInformationEntity = partInformationMapper.selectOne(queryWrapper); if (partInformationEntity == null) { diff --git a/src/main/resources/mapper/pms/EamProjectMapper.xml b/src/main/resources/mapper/pms/EamProjectMapper.xml index 10e75756..39e5a5d2 100644 --- a/src/main/resources/mapper/pms/EamProjectMapper.xml +++ b/src/main/resources/mapper/pms/EamProjectMapper.xml @@ -405,13 +405,12 @@ b.project_no, b.project_desc, b.bu_no, - b.customer_no, b.c_project_region, c.customer_desc, d.bu_desc FROM plm_project_part as a LEFT JOIN plm_project_info as b ON a.project_id = b.id - LEFT JOIN plm_customer_information as c ON b.customer_no = c.customer_no and b.site = c.site + LEFT JOIN plm_customer_information as c ON a.customer_no = c.customer_no and a.site = c.site left join CKT_MES_II_REAL.dbo.BU as d on b.site = d.site and b.bu_no = d.bu_no @@ -444,7 +443,7 @@ and a.part_desc like #{query.partDesc} - and b.customer_no = like #{query.customerNo} + and a.customer_no = like #{query.customerNo} and c.customer_desc = like #{query.customerDesc} @@ -495,13 +494,13 @@ b.project_no, b.project_desc, b.bu_no, - b.customer_no, + a.customer_no, b.c_project_region, c.customer_desc, d.bu_desc FROM plm_project_part as a LEFT JOIN plm_project_info as b ON a.project_id = b.id - LEFT JOIN plm_customer_information as c ON b.customer_no = c.customer_no and b.site = c.site + LEFT JOIN plm_customer_information as c ON a.customer_no = c.customer_no and b.site = c.site left join CKT_MES_II_REAL.dbo.BU as d on b.site = d.site and b.bu_no = d.bu_no 1=1 @@ -604,7 +603,8 @@ part_type, priority, project_category, - need_date + need_date, + customer_no ) VALUES ( #{site}, #{projectId}, @@ -629,7 +629,8 @@ #{partType}, #{priority}, #{projectCategory}, - #{needDate} + #{needDate}, + #{customerNo} ); @@ -641,7 +642,7 @@ UPDATE plm_project_part SET test_part_no = #{testPartNo},part_desc = #{partDesc},update_date = GETDATE(),update_by = #{updateBy}, build_date = #{buildDate}, priority = #{priority}, project_category = #{projectCategory}, need_date = #{needDate}, project_manager = #{projectManager}, project_owner = #{projectOwner}, engineer = #{engineer}, c_quality_engineer1 = #{cQualityEngineer1}, c_quality_engineer2 = #{cQualityEngineer2}, c_quality_engineer3 = #{cQualityEngineer3}, c_quality_engineer4 = #{cQualityEngineer4}, c_quality_engineer5 = #{cQualityEngineer5}, c_quality_engineer6 = #{cQualityEngineer6}, c_manufacture_engineer = #{cManufactureEngineer},doc_engineer = #{docEngineer}, - status = CASE WHEN #{status} IS NOT NULL THEN #{status} ELSE status END, + status = CASE WHEN #{status} IS NOT NULL THEN #{status} ELSE status END,customer_no = #{customerNo}, part_type = CASE WHEN #{partType} IS NOT NULL THEN #{partType} ELSE part_type END, close_date = (CASE WHEN #{closeDate} IS NULL THEN ISNULL(close_date, NULL)