From 469ca437924f8a1d607c56d616650b9139380ba9 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 19 Jul 2024 17:04:32 +0800
Subject: [PATCH] =?UTF-8?q?2024-07-19=20=E8=AE=BE=E5=A4=87=E7=9F=A5?=
 =?UTF-8?q?=E8=AF=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Impl/EamKnowledgeBaseServiceImpl.java     | 32 ++++++++++++-------
 .../pms/service/Impl/QcServiceImpl.java       |  2 ++
 .../mapper/pms/EamKnowledgeBaseMapper.xml     | 14 ++++----
 src/main/resources/mapper/pms/QcMapper.xml    |  3 +-
 4 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamKnowledgeBaseServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamKnowledgeBaseServiceImpl.java
index 1005ddd..7a3d82b 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamKnowledgeBaseServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamKnowledgeBaseServiceImpl.java
@@ -77,6 +77,13 @@ public class EamKnowledgeBaseServiceImpl implements EamKnowledgeBaseService {
      **/
     @Override
     public void saveKnowledgeBase(EamKnowledgeBaseData data) {
+        // 获得 site 和 bu
+        if (data.getBu().split("_").length >= 2 ) {
+            data.setSite(data.getBu().split("_")[0]);
+            data.setBuNo(data.getBu().split("_")[1]);
+        } else {
+            throw new RuntimeException("工厂和部门有误!");
+        }
         eamKnowledgeBaseMapper.saveKnowledgeBase(data);
     }
 
@@ -89,6 +96,13 @@ public class EamKnowledgeBaseServiceImpl implements EamKnowledgeBaseService {
      **/
     @Override
     public void knowledgeBaseUpdate(EamKnowledgeBaseData data) {
+        // 获得 site 和 bu
+        if (data.getBu().split("_").length >= 2 ) {
+            data.setSite(data.getBu().split("_")[0]);
+            data.setBuNo(data.getBu().split("_")[1]);
+        } else {
+            throw new RuntimeException("工厂和部门有误!");
+        }
         eamKnowledgeBaseMapper.knowledgeBaseUpdate(data);
     }
 
@@ -150,18 +164,21 @@ public class EamKnowledgeBaseServiceImpl implements EamKnowledgeBaseService {
         ossEntity.setUrl(baseFilePath.getPath());
         ossEntity.setCreatedBy(user.getUsername());
         ossEntity.setFileType(suffix.substring(1));
-        ossEntity.setFileName(fileName+suffix);
+        ossEntity.setFileName(fileName + suffix);
         ossEntity.setNewFileName(newFileName);
         ossEntity.setCreateDate(new Date());
-        ossEntity.setOrderRef1(inData.getSite());
-        ossEntity.setOrderRef2(inData.getNum());
-        ossEntity.setOrderRef3(inData.getRemark());
+        ossEntity.setOrderRef1(inData.getOrderRef1());
+        ossEntity.setOrderRef2(inData.getOrderRef2());
+        ossEntity.setOrderRef3(inData.getOrderRef3());
+        ossEntity.setOrderRef4(inData.getOrderRef4());
         sysOssService.save(ossEntity);
         return ossEntity;
     }
+
     protected SysUserEntity getUser() {
         return (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
     }
+
     public static File multipartFileToFile(MultipartFile file ,String fileName) throws Exception {
         File toFile = null;
         if (file.equals("") || file.getSize() <= 0) {
@@ -180,13 +197,6 @@ public class EamKnowledgeBaseServiceImpl implements EamKnowledgeBaseService {
         return toFile;
     }
 
-    /**
-     * @description: 获取流文件
-     * @author: fengyuan_yang
-     * @date: 2023/5/24 9:49
-     * @param: [ins, file]
-     * @return: void
-     **/
     private static void inputStreamToFile(InputStream ins, File file) {
         try {
             OutputStream os = new FileOutputStream(file);
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index 139ce01..832b6ef 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
@@ -5750,6 +5750,7 @@ public class QcServiceImpl implements QcService {
         //公共参数
         String site = inData.getSite();
         String transNo = inData.getOrderRef1();
+        String itemNo = inData.getOrderRef2();
         Float defectQty = inData.getNotPassQty().floatValue(); // 不合格数量
         Float inspectedQty = inData.getRollCount().floatValue(); // 检验数量
         String inspectStatus = inData.getInspectionResult(); // 检验结果
@@ -5758,6 +5759,7 @@ public class QcServiceImpl implements QcService {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(transNo);
+        params.add(itemNo);
         params.add(defectQty);
         params.add(inspectedQty);
         params.add(inspectStatus);
diff --git a/src/main/resources/mapper/pms/EamKnowledgeBaseMapper.xml b/src/main/resources/mapper/pms/EamKnowledgeBaseMapper.xml
index 2f1935a..66a456c 100644
--- a/src/main/resources/mapper/pms/EamKnowledgeBaseMapper.xml
+++ b/src/main/resources/mapper/pms/EamKnowledgeBaseMapper.xml
@@ -7,6 +7,7 @@
     <select id="getKnowledgeBaseList" parameterType="EamKnowledgeBaseData" resultType="EamKnowledgeBaseData">
         SELECT
             ekb.site,
+            ekb.bu_no,
             ekb.num,
             ekb.object_id,
             eo.ObjectDesc as objectName,
@@ -24,10 +25,11 @@
             ekb.order_no,
             ekb.update_by
         FROM eam_knowledge_base as ekb
-        LEFT JOIN eam_object as eo on ekb.site = eo.site and ekb.object_id = eo.ObjectID
+        LEFT JOIN eam_object as eo on ekb.site = eo.site and ekb.bu_no = eo.bu_no and ekb.object_id = eo.ObjectID
         LEFT JOIN eam_defect as ed on ekb.defect_id = ed.DefectID
         <where>
-            ekb.site = #{query.site}
+            ekb.site in (select site from eam_access_site where username = #{query.userName})
+            and (ekb.site + '-' + ekb.bu_no) in (select * from dbo.query_bu(#{query.userName}))
             <if test = "query.objectId != null and query.objectId != ''">
                 and ekb.object_id LIKE '%' + #{query.objectId}+'%'
             </if>
@@ -65,8 +67,8 @@
 
     <!-- 新增知识库文件 -->
     <insert id="saveKnowledgeBase" parameterType="EamKnowledgeBaseData">
-        INSERT INTO eam_knowledge_base (num, file_type, defect_describe, disposal_measures, file_id, file_name, remark, create_date, create_by, object_id, defect_id, site)
-        VALUES ((select 'ZS'+ Right('0000000000' + convert(VARCHAR(10), isnull(max(convert(INT, SUBSTRING(num, 3, 10))), 0) + 1), 8) from eam_knowledge_base where site = #{site}), #{fileType}, #{defectDescribe}, #{disposalMeasures}, #{fileId}, #{fileName}, #{remark}, getDate(), #{createBy}, #{objectId}, #{defectId}, #{site})
+        INSERT INTO eam_knowledge_base (num, file_type, defect_describe, disposal_measures, file_id, file_name, remark, create_date, create_by, object_id, defect_id, site, bu_no)
+        VALUES ((select 'ZS'+ Right('0000000000' + convert(VARCHAR(10), isnull(max(convert(INT, SUBSTRING(num, 3, 10))), 0) + 1), 8) from eam_knowledge_base where site = #{site}), #{fileType}, #{defectDescribe}, #{disposalMeasures}, #{fileId}, #{fileName}, #{remark}, getDate(), #{createBy}, #{objectId}, #{defectId}, #{site}, #{buNo})
     </insert>
 
     <!-- 修改知识库文件 -->
@@ -86,7 +88,7 @@
     <!-- 删除知识库文件 -->
     <delete id="knowledgeBaseDelete" parameterType="EamKnowledgeBaseData">
         DELETE FROM eam_knowledge_base
-        WHERE num = #{num} and site = #{site}
+        WHERE num = #{num} and site = #{site} and bu_no = #{buNo}
     </delete>
 
     <!-- 批量删除知识库文件 -->
@@ -94,7 +96,7 @@
         DELETE FROM eam_knowledge_base
         WHERE
         <foreach collection="list" item="item" separator=" or " index="index">
-            (num = #{item.num} and site = #{item.site})
+            (num = #{item.num} and site = #{item.site} and bu_no = #{item.buNo})
         </foreach>
     </delete>
 
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 7d3f4e7..4c959a5 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -3946,7 +3946,8 @@
             inspection_result,
             disposal_measures,
             part_no,
-            order_ref_type
+            order_ref_type,
+            order_ref2
         FROM qc_stock_record
         where site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo}
     </select>