2024.12.04 物料成本导入、询价相关文档、邮件跳转链接优化，文档收集所有文档链接全工序SOP

src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java

@@ -107,7 +107,7 @@ public class AuthHistServiceImpl extends ServiceImpl<AuthHistMapper, AuthHistDat
                 fromName = "报价单";
                 s.append("<li>有新的报价单待审批，请及时处理！报价单号:").append(Link).append("</li>");
             } else if (emailAddress.get(0).getRecordTypeDb().equals("2")) {
-                Link = "<a href='http://172.26.68.17:9001/#/auth-authQuote?rfqNo=" + emailAddress.get(0).getOrderRef1() + "'>" +
+                Link = "<a href='http://172.26.68.17:9001/#/inquiry-inquiryApplication?rfqNo=" + emailAddress.get(0).getOrderRef1() + "'>" +
                 emailAddress.get(0).getOrderRef1() + "</a>";
                 fromName = "询价申请单";
                 s.append("<li>有新的询价申请单待审批，请及时处理！询价申请单号:").append(Link).append("</li>");

src/main/java/com/xujie/sys/modules/oss/service/impl/SysOssServiceImpl.java

@@ -136,6 +136,7 @@ public class SysOssServiceImpl extends ServiceImpl<SysOssDao, SysOssEntity> impl
 		return lambdaQuery()
 				.eq(SysOssEntity::getOrderRef1, oss.getOrderRef1())
 				.eq(SysOssEntity::getOrderRef2, oss.getOrderRef2())
+				.isNull(SysOssEntity::getOrderRef3)
 				.list();
 	}
 

src/main/java/com/xujie/sys/modules/part/service/impl/PartCostHistServiceImpl.java

@@ -74,7 +74,11 @@ public class PartCostHistServiceImpl extends ServiceImpl<PartCostHistMapper, Par
                 }
                 task.setPartNo(getStringCellValue(row, 0)); // 物料编码
 
+                if (row.getCell(1) == null) {
+                    task.setStandardCost(BigDecimal.valueOf(0));
+                } else {
                     task.setStandardCost(BigDecimal.valueOf(row.getCell(1).getNumericCellValue())); //单位标准成本
+                }
 
                 if (row.getCell(2) == null) {
                     task.setStandardCostCurrency("");
@@ -82,7 +86,11 @@ public class PartCostHistServiceImpl extends ServiceImpl<PartCostHistMapper, Par
                     task.setStandardCostCurrency(row.getCell(2).getStringCellValue()); // 标准成本货币
                 }
 
+                if (row.getCell(3) == null) {
+                    task.setActualCost(BigDecimal.valueOf(0));
+                } else {
                     task.setActualCost(BigDecimal.valueOf(row.getCell(3).getNumericCellValue())); // 单位报价成本
+                }
 
                 if (row.getCell(4) == null) {
                     task.setActualCostCurrency("");
@@ -92,7 +100,7 @@ public class PartCostHistServiceImpl extends ServiceImpl<PartCostHistMapper, Par
                 task.setUpdateBy(data.getUpdateBy());
                 task.setUpdateDate(new Date());
                 QueryWrapper<PartInformationEntity> 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) {

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
         <where>
             <if test="query.projectId != null and query.projectId != ''">
@@ -444,7 +443,7 @@
                 and a.part_desc like #{query.partDesc}
             </if>
             <if test="query.customerNo != null and query.customerNo != ''">
-                and b.customer_no = like #{query.customerNo}
+                and a.customer_no = like #{query.customerNo}
             </if>
             <if test="query.customerDesc != null and query.customerDesc != ''">
                 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
         <where>
             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}
                  );
     </insert>
     <insert id="addConfirmatory">
@@ -641,7 +642,7 @@
     <update id="eamProjectPartInfoEdit">
         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)